[gentoo-commits] proj/kde:master commit in: kde-base/marble/

["Michael Palimaka" <kensington@gentoo.org>]

commit:     28ba3505748931fe2cf66056aa43a9a37237583c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 18 18:10:32 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 18 18:10:32 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=28ba3505

[kde-base/marble] Add phonon USE flag wrt bug #520384.

Phonon is required for KDE build and optional for Qt-only build.
Build fails with qtphonon (which is deprecated anyway).

Package-Manager: portage-2.2.10

---
 kde-base/marble/marble-4.14.49.9999.ebuild | 5 ++++-
 kde-base/marble/metadata.xml               | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/kde-base/marble/marble-4.14.49.9999.ebuild b/kde-base/marble/marble-4.14.49.9999.ebuild
index 6de83c1..6a1f8da 100644
--- a/kde-base/marble/marble-4.14.49.9999.ebuild
+++ b/kde-base/marble/marble-4.14.49.9999.ebuild
@@ -13,7 +13,7 @@ inherit kde4-base python-single-r1
 DESCRIPTION="Generic geographical map widget"
 HOMEPAGE="http://marble.kde.org/"
 KEYWORDS=""
-IUSE="debug designer-plugin gps +kde plasma python shapefile test zip"
+IUSE="debug designer-plugin gps +kde phonon plasma python shapefile test zip"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -30,6 +30,8 @@ RDEPEND="
 	dev-qt/qtsvg:4
 	dev-qt/qtwebkit:4
 	gps? ( >=sci-geosciences/gpsd-2.95[qt4] )
+	kde? ( media-libs/phonon[qt4] )
+	phonon? ( media-libs/phonon[qt4] )
 	python? (
 		${PYTHON_DEPS}
 		>=dev-python/PyQt4-4.4.4-r1[${PYTHON_USEDEP}]
@@ -64,6 +66,7 @@ src_configure() {
 		$(cmake-utils_use_with python SIP)
 		$(cmake-utils_use_with gps libgps)
 		$(cmake-utils_use !kde QTONLY)
+		$(cmake-utils_use_with phonon)
 		$(cmake-utils_use_with plasma)
 		$(cmake-utils_use_with shapefile libshp)
 		$(cmake-utils_use_with zip quazip)

diff --git a/kde-base/marble/metadata.xml b/kde-base/marble/metadata.xml
index 8de6bc8..3431dc8 100644
--- a/kde-base/marble/metadata.xml
+++ b/kde-base/marble/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 	<use>
 		<flag name="designer-plugin">Enable designer plugin</flag>
+		<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg></flag>
 		<flag name="shapefile">Enable support for ESRI shapefiles</flag>
 		<flag name="zip">Enable support for reading and displaying .kmz files</flag>
 	</use>