Version bump.

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

4 files changed, 134 insertions, 10 deletions

diff --git a/media-libs/phonon/ChangeLog b/media-libs/phonon/ChangeLog
index 2587bdf3da68..44395dce7d3f 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.59 2014/08/17 13:02:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/ChangeLog,v 1.60 2014/09/09 17:17:26 kensington Exp $
+
+*phonon-4.8.0 (09 Sep 2014)
+
+  09 Sep 2014; Michael Palimaka <kensington@gentoo.org> +phonon-4.8.0.ebuild,
+  phonon-9999.ebuild:
+  Version bump.
 
   17 Aug 2014; Jeroen Roovers <jer@gentoo.org> phonon-4.7.2.ebuild:
   Stable for HPPA (bug #519592).
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 7ae1c5f0cfb5..f3ca2b75aea5 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -6,15 +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.2.tar.xz 330244 SHA256 819e9734d20e254b4599d8ab45f15a68d95444c4e2088c7eb5769b58976a11be SHA512 b576b8f69ea2db58303dab3b6e64df4e3238a86610b4f549634a067ba680bd66a6df53285303a8e46df458e6da0b8e9c9112c917b054304397abb556de3a6bb5 WHIRLPOOL 2cc9a6a58d3449cc595a36c3742c03060c73a1efb10eceebf5554e504858f8d73c92c679babdc1d145d326c6024958868ee0e15fdd5eaafffcdbba98aba6f188
+DIST phonon-4.8.0.tar.xz 321468 SHA256 3bcb2a66c83fc5a4518a49cc96bb8971f155947571050a0e02b6be13c91ed524 SHA512 0dc12a4d479245ba7ffab954c91c78e3c469982e6b8ed5ff9b80150aebab448023ffde68b67a2520ca76af9ce3c0608d250f59275767c092f4e364da8cfe105f WHIRLPOOL 00bdd70549a02d601f173b58038185c4af2de6ae2bf0d89e30e212c711af7a8b7f74704ba99d83889cc3065fbe5f78797c42cf538dd9c7e813aa3208c83b6a8b
 EBUILD phonon-4.6.0-r1.ebuild 2241 SHA256 391af060ed7195b30ab641fdb5c22192eba93064739f728c2eac617ed6ee98d1 SHA512 be3a1416953f5e9166b32a915c33e4bf3a8aa9ad24e353733e2f8d2ad587f43f5bc67cfc00c74ccba255e1b818409319bb8232a93c9c0fbc658775008413207b WHIRLPOOL 360fbf823e7848be981d2ba2bc236304e4a3c6c3b0469e5b5883ce33fe623f5202263e18039617e303b2313620129601141ac6641576dd50a65a49b43bc5c564
 EBUILD phonon-4.7.2.ebuild 2470 SHA256 1804d6f4cd9700db914590de9edcbc4acfd7a170628a9780b24c27c19bd1e422 SHA512 af39d3f7ea7687b8a79c8df3506d157567a8cf486acf31c6378afd41035db40f393bf4f3aec218623b2d395d838f70e1eb6f4eb1de986652a2f5575a12ae3ed4 WHIRLPOOL eb34d6cab47e3be166b4a902d4aee4d6fd53d042433143ddc3edd0ec77df2f84ee287ffb78e14023b37de31799824e8f94649fb6ecc6efb51db87202a0d09221
-EBUILD phonon-9999.ebuild 2472 SHA256 09a602f4ef4a2375d5f360d2c2a95dae0a9cd7c9064ec8df52b5f70e9a35383a SHA512 e801d32cb94a4f45d02ffb7e213c20c967eded3e3f3d5aeb3772663a2b0eaddebc7f48d0bd29935b888c7e9110b631d294e3cca25e1e5605d2f0d0703e57d23a WHIRLPOOL 0a757a3579401a0e2de3de8ad243eb87b900f5359d49fbe37a3a120542591b03b60b1dfc0ab38b7bfe47addb4dcd90d322093123214620b15042b446b1275bfb
-MISC ChangeLog 18338 SHA256 378a25dceb9a5989f4e8ca83390c0830d286dfcf1dbdbaeedd751be80cf0d738 SHA512 428dad360fb1eab5e6c401f8917c4344aa88d44c74701e253b14ff798b60fed0f095a8002fae3a99b771269b6eae7ce4871d62c3ee63d836518596c270d38624 WHIRLPOOL 7872235df3cf4228ae7e6a923b9fe0260d792ac253f609422aebb9394975646754c9027b6ef69d7d43aa296c854ab55345cfe838869a0759c59ddb37a4f63025
+EBUILD phonon-4.8.0.ebuild 2478 SHA256 3aab6a7799c175d8de8739ab1eee06ff10b8ff6b36323f7371fce92b80aa3b1b SHA512 f5ea712528e1665fbf8a03b7c9b398fea2e0adc1aec2dd29cdfeca20435f80275ff3ba591da8b182d5341d9550f882961999eeb53bc93a525fec8e7f97279421 WHIRLPOOL 4a5914efd5adffdb168ca2f6ad6679e1aac285a372383bf0424dfc944b1784aae9f16f22e753ca69347a7cbd1c5fcaefba405f0964024bbca198b04400f9e0be
+EBUILD phonon-9999.ebuild 2478 SHA256 812d9b32d845010695bde886cef8f16c0fce8d89c50ad2e45eb6474a53a8abdc SHA512 6d1fbc2def0f27c51093ea4aaf9dbd6f7766135aee5f8a68cee5771ef37878f3345b3d6eddcde8a53b8bc53ee384f083cd58d1834738d799f68057f77bb3726c WHIRLPOOL 0cc86baed7c41fc8939f567f8fcc289f83a5a29e57d6081c4b380f0f3f87daa8e7cdda9c048ad7a72bec47c5288ab7bd575c2366dcae9ef458a74d0731e748d3
+MISC ChangeLog 18491 SHA256 ed9cc516aab1886864248d49e13babae7444f2fef4672301327d77f0837bad6e SHA512 b692efa7ddf5e579101cbdb1e661a5954e1d8969795544712446bff5384ac32ae80ab8177a82244a807dabd3d42f27bcedc84b4dc2be4f21988a98bcccc9fd8d WHIRLPOOL 5eb26bffdbad5cf73f31cbce8b74243dc4c822a8bf448927f8f3ddbb3b561df477b6571ed76366395c43513fdf3582e89ce64ae9da4e7afb51d04a9961441b20
 MISC metadata.xml 382 SHA256 6758869ff5c1d28cbfabfb7ad27e23038a688afcbfbc8f880c742ab9be908f06 SHA512 41f9e7123fc4069d8bc6258113de25b8de23c7a396ae4285507ebac62dfe0fa93f939940533ccb39c1e1d5419f7f0bb65db2517a0789b7242bd36cb3dc612f57 WHIRLPOOL ad1713d849565ad3a1f85ee59cbbdf857877b308d093061d6db7bffa829a1daf3b94213b6d007d9832ba4e9091d8c9b0bb7b25bdd2e41628c1786cab799b707a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlPwp88ACgkQVWmRsqeSphN17wCfd+A8ZhWW/SysbDcYFVbViTeF
-y8IAnj1AYzsygg+xePu2hM0DS4Fu308k
-=P9Ln
+iQJiBAEBCABMBQJUDzYwRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7CsPEADGeC5lno6t2NE3zjaa77U0OFukTxQ5ggnDgimQ0tVnXqDQGLmjX1nNO9+q
+gDDKj6Z0PiavZDFHDqZDm/e0eHeSKBOEfFnlVqn8JuIXpcJie+DmPjKXqR/MbyP/
+CI9YwpgZzTStQWqKynUhU5HiuCXgjcxAJWKbUTNfKn+XLxl0EXYNayOkRpYY1xgN
+Jg9DwoOmSHJMG5BgZ/57dzIm6eOfjGMw7oL3fccORAPF04TsP54GW+sIW3a+lT4h
+k4uvuIip8pNh7g0yjzL9/Z4/IlHW+/K5YQdWfyTYF4h98492VWbstML98o8IzPA/
+0ChU6ema/v2inoyPj0QN0l8a7LpLJqY8EZnCx4fC9rUbHBqNx3io+kbgetgK0Ior
+jhiBhtfKtP/xA4MuzYb7MVu5f8QoJ3TPQoVPvztJWytzvwgiag42SCuxOAL4dB6k
+fKxOXWd/RoNsWMCAadtXv4eXHrrSVCICzV+Xcln+5noG1W7MXCedrT1e5UnRmTx6
+v9ObFoM08tQGuwakX+PbYGg5XCovJklDIptZPeDPMPR8/2xOe+nKVA3Xk/kiii0Z
+nYa9JFHfDsH97N9KIwdmp8S9cTArfuJj0f6BxvXE6R5xSRAsMokr/f2yiNurxnkZ
+S5DT+oXkPjYvVHlJDEH8ohSfa1oSQEHHe8d6ODINkJLGzxggFA==
+=YQ74
 -----END PGP SIGNATURE-----
diff --git a/media-libs/phonon/phonon-4.8.0.ebuild b/media-libs/phonon/phonon-4.8.0.ebuild
new file mode 100644
index 000000000000..39801cc7d67d
--- /dev/null
+++ b/media-libs/phonon/phonon-4.8.0.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.0.ebuild,v 1.1 2014/09/09 17:17:26 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.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
+}
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-9999.ebuild
index d6bc009e1314..c07fbb38494d 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.24 2014/08/10 21:42:11 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-9999.ebuild,v 1.25 2014/09/09 17:17:26 kensington Exp $
 
 EAPI=5
 
@@ -55,8 +55,8 @@ DEPEND="${RDEPEND}
 "
 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?] )
+	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" )