Amarok utils require Qt4, drop implicit Qt dep caused by OPENGL_REQUIRED and replace...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 3b93eefda03782a2ce2efced405c97913dbebf90..dc6cbcbe36b5adb8a254fc3d3679f85b37283e31 100644 (file)
--- 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/Manifest b/media-sound/amarok/Manifest
index 993e484b1c07419385c8d04482191f3c3491f404..79c6f4524efe8c54850a83150550ef63143f0a2b 100644 (file)
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -6,7 +6,7 @@ AUX amarok-qtscriptcheck.patch 1024 RMD160 0693ddd6bbaa2f15d381eec329cfeff1e8b17
 DIST amarok-2.2.2.tar.bz2 8788107 RMD160 0782c4b032d318179bd8bb91353f8e33772d2912 SHA1 2075299b856477cf55cba8ba983ea25a93dc139b SHA256 768d308572897a3100f0d87999f1bb1c68b2e2fa3b0961fd0b918bcfd33ae64d
 DIST amarok-2.3.1.tar.bz2 9823411 RMD160 70e581bd681361d7837f1ed295191174e92e9f8f SHA1 00a596384df8d155b91b40bb2484ec0a7f51da80 SHA256 3fef3f4d4b4ffa22faf4a3b97e2c2bcfde85f55a9973b1ad6d66df55068b4a72
 EBUILD amarok-2.2.2-r1.ebuild 3129 RMD160 7f2f764b4542d2447b7e1109c757a45ea8f0f403 SHA1 24f628aaf70a20f4160fa135df7d07e4f83f724f SHA256 fda21a42223a92bf47f68e2b2824b332017c480c3164389b76b1f8c5106459d1
-EBUILD amarok-2.3.1-r1.ebuild 4311 RMD160 6e94336149ecee31791da5f2733cc35b7a964581 SHA1 b0ca9f73b88f16287f86d712198aaad025dda432 SHA256 8ef9da87202258ab80d8b9e3c0ce5e0e7d9b765e9d3ce2f7b25dd8df7d52c07c
+EBUILD amarok-2.3.1-r1.ebuild 4193 RMD160 5a8190047968af599c71530f892497f3e11b5843 SHA1 b412ac976f6c817015f58d497b01c1fd4085340d SHA256 a1537884b4501d0f41a350df3314cb1c71bc9d7dc8e9e5fe5a0c48c020642729
 EBUILD amarok-2.3.1.ebuild 3465 RMD160 7834bed748ffc58ae9573eaad9f779de67332598 SHA1 ce11a10148980406634e9b494c6eeb530c647f7e SHA256 86b44855a9c8ea722406a13ef861350d18ba8e19ff7c11b202e9a3db9557a632
-MISC ChangeLog 62950 RMD160 51709229bce8fc19149686bb920aa4d158fef2ff SHA1 30ec3b55bc43df8c10968c615b22eb771464a153 SHA256 d932390ee6f4f2afad1ef161eec8e894fb669db68ddd2e92bada0d7fd6cb585c
+MISC ChangeLog 63201 RMD160 fa21a118ad870e170cf0090386ec8ead82ec7a75 SHA1 6b2590498e5c796f4c8f3426c913a0f548049fee SHA256 f9a4d68a5c1bf304edf8c5451639cf03a4664b6aa8c889a65cbf5d7ee04a8352
 MISC metadata.xml 1413 RMD160 62fc2ae4eae51f52f3ef02d86e8b244a3132ba86 SHA1 dda8b8bf344947925b93744cff693605f46c1006 SHA256 be46bcd7f470f66bb3afc8df3338aab204e055e10f042d4bae2be65eae7b3f8f

diff --git a/media-sound/amarok/amarok-2.3.1-r1.ebuild b/media-sound/amarok/amarok-2.3.1-r1.ebuild
index d169d6806fa249b1bf7dd55e7a3cf7b7ba44bd2e..9ce1b6417d75aaeb440d79d44592ca7a1b4cdb55 100644 (file)
--- 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