Amarok utils require Qt4, drop implicit Qt dep caused by OPENGL_REQUIRED and replace it by explicit dependency, nepomuk is pulled by kdelibs[semantic-desktop] already

(Portage version: 2.2_rc67/cvs/Linux x86_64)

2 files changed, 25 insertions, 23 deletions

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 3b93eefda037..dc6cbcbe36b5 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/amarok
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.378 2010/06/12 19:58:17 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.379 2010/06/13 02:12:28 reavertm Exp $
+
+  13 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  amarok-2.3.1-r1.ebuild:
+  Amarok utils require Qt4, drop implicit Qt dep caused by OPENGL_REQUIRED
+  and replace it by explicit dependency, nepomuk is pulled by
+  kdelibs[semantic-desktop] already
 
   12 Jun 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   amarok-2.3.1-r1.ebuild:
diff --git a/media-sound/amarok/amarok-2.3.1-r1.ebuild b/media-sound/amarok/amarok-2.3.1-r1.ebuild
index d169d6806fa2..9ce1b6417d75 100644
--- a/media-sound/amarok/amarok-2.3.1-r1.ebuild
+++ b/media-sound/amarok/amarok-2.3.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.3.1-r1.ebuild,v 1.3 2010/06/12 19:58:17 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.3.1-r1.ebuild,v 1.4 2010/06/13 02:12:28 reavertm Exp $
 
 EAPI="2"
 
@@ -8,26 +8,26 @@ EAPI="2"
 if [[ ${PV} != *9999* ]]; then
 	KDE_LINGUAS="bg ca cs da de en_GB es et eu fi fr it ja km nb nds nl
 	pa pl pt pt_BR ru sl sr sr@latin sv th tr uk wa zh_TW"
+	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${P}.tar.bz2"
 else
 	EGIT_REPO_URI="git://gitorious.org/${PN}/${PN}.git"
 	GIT_ECLASS="git"
 fi
-OPENGL_REQUIRED="optional"
+
 KDE_REQUIRED="never"
 inherit flag-o-matic kde4-base ${GIT_ECLASS}
 
 DESCRIPTION="Advanced audio player based on KDE framework."
 HOMEPAGE="http://amarok.kde.org/"
-if [[ ${PV} = *9999* ]]; then
-	SRC_URI=""
-else
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
-fi
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~x86"
 SLOT="4"
-IUSE="cdda daap debug embedded ipod lastfm mp3tunes mtp +player semantic-desktop +utils"
+IUSE="cdda daap debug embedded ipod lastfm mp3tunes mtp opengl +player semantic-desktop +utils"
+
+# Tests require gmock - http://code.google.com/p/gmock/
+# It's not in the tree yet
+RESTRICT="test"
 
 # ipod requires gdk enabled and also gtk compiled in libgpod
 # Some UI dialogs require qt-gui built with the accessibility use flag
@@ -59,30 +59,23 @@ DEPEND="
 			x11-libs/qt-core[glib]
 		)
 		mtp? ( >=media-libs/libmtp-0.3.0 )
+		opengl? ( virtual/opengl )
+	)
+	utils? (
+		x11-libs/qt-core
+		x11-libs/qt-dbus
 	)
 	!player? ( !utils? ( media-sound/amarok[player] ) )
 "
 RDEPEND="${DEPEND}
-	!<=media-sound/amarok-utils-2.3.1
-	>=kde-base/phonon-kde-${KDE_MINIMAL}
-	player? (
-		semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
-	)
+	!media-sound/amarok-utils
+	player? ( >=kde-base/phonon-kde-${KDE_MINIMAL} )
 "
 
-# Tests require gmock - http://code.google.com/p/gmock/
-# It's not in the tree yet
-RESTRICT="test"
-
 PATCHES=( "${FILESDIR}/${PN}-fix-accessibility-dep.patch" )
 
-# required for live ebuild, to skip git_src_prepare, to add
-# the minimal-toc cflag for ppc64 and to fix po issues on utils
 src_prepare() {
-	use ppc64 && append-flags -mminimal-toc
-
 	if ! use player; then
-
 		# Disable po processing
 		sed -e "s:include(MacroOptionalAddSubdirectory)::" \
 			-i "${S}/CMakeLists.txt" \
@@ -96,6 +89,9 @@ src_prepare() {
 }
 
 src_configure() {
+	# Append minimal-toc cflag for ppc64, see bug 280552 and 292707
+	use ppc64 && append-flags -mminimal-toc
+
 	if use player; then
 		mycmakeargs=(
 			-DWITH_PLAYER=ON