From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 847B213838B for ; Thu, 18 Sep 2014 18:10:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 918F6E0824; Thu, 18 Sep 2014 18:10:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3DFE2E0824 for ; Thu, 18 Sep 2014 18:10:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 660793400D3 for ; Thu, 18 Sep 2014 18:10:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1701E5E7A for ; Thu, 18 Sep 2014 18:10:41 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1411063832.28ba3505748931fe2cf66056aa43a9a37237583c.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/marble/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/marble/marble-4.14.49.9999.ebuild kde-base/marble/metadata.xml X-VCS-Directories: kde-base/marble/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 28ba3505748931fe2cf66056aa43a9a37237583c X-VCS-Branch: master Date: Thu, 18 Sep 2014 18:10:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c9756567-79cb-4d39-8922-462c8db7435a X-Archives-Hash: b6a513c520c438e009166b0e96917f3a commit: 28ba3505748931fe2cf66056aa43a9a37237583c Author: Michael Palimaka gentoo org> AuthorDate: Thu Sep 18 18:10:32 2014 +0000 Commit: Michael Palimaka gentoo 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 @@ Enable designer plugin + Enable sound support via media-libs/phonon Enable support for ESRI shapefiles Enable support for reading and displaying .kmz files