summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Mrozowski (reavertm) <reavertm@poczta.fm>2009-05-22 20:09:18 +0200
committerMaciej Mrozowski (reavertm) <reavertm@poczta.fm>2009-05-22 20:10:22 +0200
commit5a77a39646732dc2ab5be80b937641404c0e1750 (patch)
tree5082a0138c63b9aa8fd6f9ebeeabbfc20d7faac4
parent303f59753bc41188fe5bdd41a24e5fc3d29f3429 (diff)
downloadkde-5a77a39646732dc2ab5be80b937641404c0e1750.tar.gz
kde-5a77a39646732dc2ab5be80b937641404c0e1750.tar.bz2
kde-5a77a39646732dc2ab5be80b937641404c0e1750.zip
[media-sound/amarok] - added back qtscriptgenerator test (works here with and w/o kdeprefix), more strict amarok-utils deps.
-rw-r--r--media-sound/amarok/ChangeLog5
-rw-r--r--media-sound/amarok/Manifest6
-rw-r--r--media-sound/amarok/amarok-2.0.96-r1.ebuild14
-rw-r--r--media-sound/amarok/amarok-9999.ebuild14
4 files changed, 18 insertions, 21 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 8c01ea62017..9586ce6359e 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 22 May 2009; Maciej Mrozowski (reavertm) <reavertm@poczta.fm>
+ amarok-2.0.96-r1.ebuild, amarok-9999.ebuild:
+ Added back qtscriptgenerator test (tested with and
+ w/o kdeprefix), more strict amarok-utils deps.
+
15 May 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
amarok-2.0.90-r2.ebuild, amarok-2.0.96-r1.ebuild, amarok-9999.ebuild:
Fixed typo in the amarok ebuilds. Thanks to karthik
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index ebe79f5bedc..ebf51de2253 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -3,7 +3,7 @@ AUX disable_bindings_test.patch 550 RMD160 3ff076dccf7036fcd52836ff529ae16b56fdc
DIST amarok-2.0.90.tar.bz2 5201787 RMD160 a0bb847cd254197e17e1cfcf7b565c395629e7c4 SHA1 a7926b514d52e4a445fbf307fb16d4b5b058c017 SHA256 ef38f9bb0b34f12e1aac7884431038ae62d1bb9a2a1a6ffe36c2fcd6f3d7e51b
DIST amarok-2.0.96.tar.bz2 5189289 RMD160 ed7eccf0657d32ebe43f50b6aa53f2a1bf3246ca SHA1 392d915c07c648c2935f6d2499cecc08ac808292 SHA256 32cceb325e3c7d2bebc8ba852f916cc406ff42bc3a52bf4d457e5391c24a1de4
EBUILD amarok-2.0.90-r2.ebuild 2058 RMD160 3fbe0a3b8eef3263fa68f82b3306b5988685f7db SHA1 d099411f5c3ab62072bcda2219801b8881844bfa SHA256 037775a8123df7c743aaf07606cf1edbf59300d00c231b59bccc70f15b8c8355
-EBUILD amarok-2.0.96-r1.ebuild 2058 RMD160 3fbe0a3b8eef3263fa68f82b3306b5988685f7db SHA1 d099411f5c3ab62072bcda2219801b8881844bfa SHA256 037775a8123df7c743aaf07606cf1edbf59300d00c231b59bccc70f15b8c8355
-EBUILD amarok-9999.ebuild 1986 RMD160 1c48b64eb6011e9314c481bdf9763c428102aba4 SHA1 f5a9ed6b9c38e9cca587ded7d79eaf1baafd7d0d SHA256 6cb9a01386366d21efea289806bb1b958c87a6c4f994649fa5669305c3e4bbf5
-MISC ChangeLog 7160 RMD160 8c0bfbce4a0abc3f4d4b529909ed87607d8f0c19 SHA1 8ea289df94ee548a3c4da6672b934fc7697ce9da SHA256 6397e0108171144edb3c2f22d4f6acf1e6c20783168eeb4004a705783952f4eb
+EBUILD amarok-2.0.96-r1.ebuild 2066 RMD160 245e13d27842e33bb2510bccc9ada2b1dfe3ea81 SHA1 b21d96e1363a5221e1ae745c7555f1aaebe0c187 SHA256 f0de9717429ad030d82f71ea1b1d05ff2a2adc03d4c3ea23ce3c74a7e574f335
+EBUILD amarok-9999.ebuild 1994 RMD160 3feb9825d914e56c97e528edddb44118509f180e SHA1 6f0eb31b841f1155b19311bf56016f96e68df4c2 SHA256 7444c55cb134b3808df1e742ca7c3550c511d98aeac19621db5962552e21b260
+MISC ChangeLog 7374 RMD160 ca68786199087c99e1c6bc3b3b263e496427cb02 SHA1 4e99fda3c0d87461094435464c87e204faa53e1a SHA256 9f017789a7a02127520a10b93f35aa621a0ae96529359641971e2bff4be33c16
MISC metadata.xml 1999 RMD160 63f7987491620b67603d2c53e673c49c55937d62 SHA1 9c8ca66b5d1f1804ec8087cf2a05d07a2aacee25 SHA256 1b1484b185d63cd03c8bbc85c797447b5249d12b7e04db0fa64efecf89cd28f8
diff --git a/media-sound/amarok/amarok-2.0.96-r1.ebuild b/media-sound/amarok/amarok-2.0.96-r1.ebuild
index 6e13f9cfb1f..e21b99fc014 100644
--- a/media-sound/amarok/amarok-2.0.96-r1.ebuild
+++ b/media-sound/amarok/amarok-2.0.96-r1.ebuild
@@ -48,19 +48,15 @@ DEPEND="
"
RDEPEND="${DEPEND}
>=kde-base/phonon-kde-${KDE_MINIMAL}
- media-sound/amarok-utils
+ >=media-sound/amarok-utils-${PV}
semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
"
-src_prepare() {
- kde4-base_src_prepare
-
- append-flags -I${KDEDIR}
- append-ldflags -L${KDEDIR}/$(get_libdir) -Wl,--as-needed
- epatch "${FILESDIR}/disable_bindings_test.patch"
-}
-
src_configure() {
+ # Workaround for problems related to libmysqld.so and collection plugin not
+ # being found on some architectures when --as-needed is not used.
+ append-ldflags -Wl,--as-needed
+
mycmakeargs="${mycmakeargs}
-DWITH_PLAYER=ON
-DWITH_UTILITIES=OFF
diff --git a/media-sound/amarok/amarok-9999.ebuild b/media-sound/amarok/amarok-9999.ebuild
index 4a7a25a11ab..5d934e1aa54 100644
--- a/media-sound/amarok/amarok-9999.ebuild
+++ b/media-sound/amarok/amarok-9999.ebuild
@@ -47,19 +47,15 @@ DEPEND="
"
RDEPEND="${DEPEND}
>=kde-base/phonon-kde-${KDE_MINIMAL}
- media-sound/amarok-utils
+ >=media-sound/amarok-utils-${PV}
semantic-desktop? ( >=kde-base/nepomuk-${KDE_MINIMAL} )
"
-src_prepare() {
- kde4-base_src_prepare
-
- append-flags -I${KDEDIR}
- append-ldflags -L${KDEDIR}/$(get_libdir) -Wl,--as-needed
- epatch "${FILESDIR}/disable_bindings_test.patch"
-}
-
src_configure() {
+ # Workaround for problems related to libmysqld.so and collection plugin not
+ # being found on some architectures when --as-needed is not used.
+ append-ldflags -Wl,--as-needed
+
mycmakeargs="${mycmakeargs}
-DWITH_PLAYER=ON
-DWITH_UTILITIES=OFF