summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2009-04-15 05:43:18 +0000
committerJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2009-04-15 05:43:18 +0000
commit9474027b92ece4f5cc7edb4df43fa36866c1c28e (patch)
treebb5db42cb1cf2729332c61a22ed700377df877b2 /media-sound/amarok
parentInitial import to the tree of qtscriptgenerator from the kde-testing overlay. (diff)
downloadgentoo-2-9474027b92ece4f5cc7edb4df43fa36866c1c28e.tar.gz
gentoo-2-9474027b92ece4f5cc7edb4df43fa36866c1c28e.tar.bz2
gentoo-2-9474027b92ece4f5cc7edb4df43fa36866c1c28e.zip
Disabled building the included qtscriptgenerator and added dep to the separate package.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/amarok')
-rw-r--r--media-sound/amarok/ChangeLog7
-rw-r--r--media-sound/amarok/amarok-2.0.2-r1.ebuild7
2 files changed, 12 insertions, 2 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index efb64863eec2..f3b0ac2ace3f 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/amarok
# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.315 2009/04/15 00:47:45 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.316 2009/04/15 05:43:18 jmbsvicetto Exp $
+
+ 15 Apr 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ amarok-2.0.2-r1.ebuild:
+ Disabled building the included qtscriptgenerator and added dep to the
+ separate package.
15 Apr 2009; Ryan Hill <dirtyepic@gentoo.org>
+files/amarok-1.4.10-gcc44.patch, amarok-1.4.10_p20090130-r1.ebuild:
diff --git a/media-sound/amarok/amarok-2.0.2-r1.ebuild b/media-sound/amarok/amarok-2.0.2-r1.ebuild
index 3660bb711e7f..fe8dcfe1c237 100644
--- a/media-sound/amarok/amarok-2.0.2-r1.ebuild
+++ b/media-sound/amarok/amarok-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.0.2-r1.ebuild,v 1.1 2009/04/14 03:29:43 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-2.0.2-r1.ebuild,v 1.2 2009/04/15 05:43:18 jmbsvicetto Exp $
EAPI="2"
@@ -31,6 +31,7 @@ DEPEND="
>=kde-base/kdelibs-${KDE_MINIMAL}[opengl?,semantic-desktop?]
>=kde-base/phonon-kde-${KDE_MINIMAL}
>=kde-base/plasma-workspace-${KDE_MINIMAL}
+ x11-libs/qtscriptgenerator
cdaudio? (
>=kde-base/libkcompactdisc-${KDE_MINIMAL}
>=kde-base/libkcddb-${KDE_MINIMAL}
@@ -65,6 +66,10 @@ src_configure() {
sed -e 's/ -DQT_WEBKIT//g' \
-i "${S}"/src/scriptengine/generator/generator/CMakeLists.txt \
|| die "Removing unnecessary -DQT_WEBKIT failed."
+ # Remove qtscript-generator
+ sed -e 's:add_subdirectory( src/scriptengine/generator )::g' \
+ -i "${S}"/CMakeLists.txt \
+ || die "Removing qtscriptgenerator failed."
mycmakeargs="${mycmakeargs}
$(cmake-utils_use_with cdaudio KdeMultimedia)