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
commit32aa42f63e7bb61ec8bbf2589eee2b22c67f886b (patch)
treef2c676b4fb633022f3919c5610b9cff6f2fdf5c6 /media-sound
parentInitial import to the tree of qtscriptgenerator from the kde-testing overlay. (diff)
downloadhistorical-32aa42f63e7bb61ec8bbf2589eee2b22c67f886b.tar.gz
historical-32aa42f63e7bb61ec8bbf2589eee2b22c67f886b.tar.bz2
historical-32aa42f63e7bb61ec8bbf2589eee2b22c67f886b.zip
Disabled building the included qtscriptgenerator and added dep to the separate package.
Package-Manager: portage-2.2_rc28/cvs/Linux x86_64
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/amarok/ChangeLog7
-rw-r--r--media-sound/amarok/Manifest14
-rw-r--r--media-sound/amarok/amarok-2.0.2-r1.ebuild7
3 files changed, 14 insertions, 14 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/Manifest b/media-sound/amarok/Manifest
index f5413c568abf..36ea868dfb9f 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 2.0.1.1-ipod.patch 6713 RMD160 40a0da7ceca93e081edfa660383f8281dc4c2d68 SHA1 8a1aad8e9a8ad34fac3de7ca8ba5966c4dbfb50f SHA256 612cdb6886d0bac22773d7a621d3062d0eb96801cff8053d4011e44cb738fb61
AUX amarok-1.4.10-audibletag.patch 2412 RMD160 9c37b2861c17a3ff9c5a447338cbbc735fcfd634 SHA1 25ebc67a0f6254c1fae9a96b967f700a5ea81746 SHA256 724f2411cc9a6d4cc972fe6b3d40bdf1d4075347eca3460bdaf0b35980f838a3
AUX amarok-1.4.10-gcc-4.3.patch 271 RMD160 facfb2796b871f3b3a5cb0c5e2268386950b3801 SHA1 c86f458ba6ae8d5b78a047852f9f2699e6da2908 SHA256 b96e976276f5c87265ecdb62b596f6f2e91c921130b833b0e395f2b50c9fa9cc
@@ -18,13 +15,6 @@ EBUILD amarok-1.4.10-r2.ebuild 3122 RMD160 090b3339a6af25c617c85edefb681f2944a4e
EBUILD amarok-1.4.10-r3.ebuild 3226 RMD160 38303bdfe9ad65d6861379e51bddfc598f719e60 SHA1 a2f550c116ef3ee20b62ff0b0ee579e04ea0a997 SHA256 61aad4673e25198ce540f657abf4eefce408fb510947626737622254794c048f
EBUILD amarok-1.4.10_p20090130-r1.ebuild 3201 RMD160 63062644bac15b2263bce78e4762f6f2f7ad01fd SHA1 14d1af889019f55e92a8dbd655b403134c69bcd4 SHA256 fa9b2da0ee9a008fd4453b35895b4eb1021d372a20ea5a27cb37d486abb035e4
EBUILD amarok-2.0.1.1.ebuild 2318 RMD160 b87f86fad0f1064629a4f9187e618a1215856598 SHA1 f93ebfd298b97597e81bb47c55ad50a9d633abe6 SHA256 9f5497169f33b796d9d40d570a58a426354f11aea52bf496341df94283736296
-EBUILD amarok-2.0.2-r1.ebuild 2355 RMD160 5d1e4f4728fab7cb9a75ba48a0caa2e91e6e090e SHA1 46a90df80898393457ddfc7558a4e46d4bca039a SHA256 42aac557e95e4307d6b60fd30c0a0e2c9fdbb05a8a77035196b1c301a0305bba
-MISC ChangeLog 51135 RMD160 c53e8ffc0198a8a659d0b3f05c4ffe9b462f8cf9 SHA1 b3dbd22b6f15f47d6fef0ec30731bfc1bd04813e SHA256 a9150f0423ef66c029d7e914614c889629471a007c39899707948016755ec9b6
+EBUILD amarok-2.0.2-r1.ebuild 2551 RMD160 4765cc5f7971e9e3eb4447bea297b3f4460c4831 SHA1 7f42747f9190896f3ca893f1eb364ec57eb333d8 SHA256 3eb520088940d4df2237633018a9d53509a3de4c24cb2e162bd721aa80c6f52f
+MISC ChangeLog 51323 RMD160 34e02dee7a32247f6db8ded39185ec8fea5f419c SHA1 bdbbc2995e56d2572a0974602c62f0562a01d112 SHA256 c73259d52f1c578c10b68018ee4037665c1f75f6e4642e570a6cbdf3311cacf4
MISC metadata.xml 2198 RMD160 20512dd449b537ffd44a2e052359f0939be4df96 SHA1 feee1598c24a41fa4296f37f1e41b3154b8dc7e4 SHA256 c6e222bf1223b29d298a3f988701376515912c9938b53f284839bc432f49066b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAknlLy4ACgkQiqiDRvmkBmLzeACfVfG0iyb6ldCSCDf2FaHGl72m
-jBEAoMmC9yN6flVig8y82+rLRFsVpQ6y
-=I9HH
------END PGP SIGNATURE-----
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)