6 files changed, 32 insertions, 17 deletions
diff --git a/media-sound/amarok/ChangeLog b/media-sound/amarok/ChangeLog
index 23211938d318..5a62e87fe3ac 100644
--- a/media-sound/amarok/ChangeLog
+++ b/media-sound/amarok/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/amarok
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.63 2005/07/30 20:28:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/ChangeLog,v 1.64 2005/07/31 12:33:50 flameeyes Exp $
+
+  31 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> amarok-1.2.3.ebuild,
+  amarok-1.2.4.ebuild, amarok-1.3_beta1.ebuild, amarok-1.3_beta2.ebuild:
+  Use ${KDEDIR} instead of kde-config to set PREFIX as it's not in path during
+  src_compile().
 
   30 Jul 2005; Simon Stelling <blubb@gentoo.org> amarok-1.2.4.ebuild:
   stable on amd64
diff --git a/media-sound/amarok/Manifest b/media-sound/amarok/Manifest
index e853c26d5f24..318aebbc33f0 100644
--- a/media-sound/amarok/Manifest
+++ b/media-sound/amarok/Manifest
@@ -1,11 +1,21 @@
-MD5 92f877cbb49932210f5c09d6a90f9656 ChangeLog 9366
-MD5 aab25aa93b05a1e723711c82837bfce4 amarok-1.3_beta2.ebuild 2896
-MD5 48c5474a5e08ba5505c2f95795bfa7cd amarok-1.2.4.ebuild 2406
-MD5 88b8d4c17bbbc286e9080ea98c366fb1 amarok-1.2.3.ebuild 2338
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5635afceb32cd272b00707ddaea0d6e5 amarok-1.2.3.ebuild 2329
 MD5 b23600108f12c98a4fd574d3487ee598 metadata.xml 175
-MD5 7a18e71953e53d1f6c6e88cf107f4981 amarok-1.3_beta1.ebuild 2628
-MD5 32030194ea3f2079d1db17aa160f63a2 files/amarok-gcc4.gz 522
-MD5 95e269be8072f18e8c81a8f7c0036c52 files/digest-amarok-1.3_beta2 70
+MD5 1ee3acebe81507e0c32abba7e8b064d4 amarok-1.2.4.ebuild 2398
+MD5 d3b33fd9fcb926b909632ac3906a4db6 amarok-1.3_beta1.ebuild 2616
+MD5 be3b5561aa4735d778bdf2975882d329 amarok-1.3_beta2.ebuild 2887
+MD5 781b0e6b07baa420ad37cb7fb1bbaec5 ChangeLog 9614
+MD5 55c15fa0003bd71db5f7e23d750c0b16 files/digest-amarok-1.2.3 66
 MD5 9966964d087dd7c05b7fa2efeff9b1ac files/digest-amarok-1.2.4 66
 MD5 33dc3bd54b4b930141bae88dd6b51bb7 files/digest-amarok-1.3_beta1 70
-MD5 55c15fa0003bd71db5f7e23d750c0b16 files/digest-amarok-1.2.3 66
+MD5 32030194ea3f2079d1db17aa160f63a2 files/amarok-gcc4.gz 522
+MD5 95e269be8072f18e8c81a8f7c0036c52 files/digest-amarok-1.3_beta2 70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC7MVLj5H05b2HAEkRAtunAKCadJOiimDq+FoUMsQCdT6eAI0lTwCfQPfA
+Npr+Osu8Uo9pd8j+g3EZri0=
+=Tc9/
+-----END PGP SIGNATURE-----
diff --git a/media-sound/amarok/amarok-1.2.3.ebuild b/media-sound/amarok/amarok-1.2.3.ebuild
index aa35bc116dfb..35418f90c2cd 100644
--- a/media-sound/amarok/amarok-1.2.3.ebuild
+++ b/media-sound/amarok/amarok-1.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2.3.ebuild,v 1.4 2005/06/17 16:34:16 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2.3.ebuild,v 1.5 2005/07/31 12:33:50 flameeyes Exp $
 
 inherit kde eutils
 
@@ -59,7 +59,7 @@ src_compile() {
 	# amarok does not respect kde coding standards, and makes a lot of
 	# assuptions regarding its installation directory. For this reason,
 	# it must be installed in the KDE install directory.
-	PREFIX="`kde-config --prefix`"
+	PREFIX="${KDEDIR}"
 
 	myconf="$(use_with arts) $(use_with xine)
 		$(use_with gstreamer) $(use_enable mysql)
diff --git a/media-sound/amarok/amarok-1.2.4.ebuild b/media-sound/amarok/amarok-1.2.4.ebuild
index e21cddc876ac..5fd3a25f4ab3 100644
--- a/media-sound/amarok/amarok-1.2.4.ebuild
+++ b/media-sound/amarok/amarok-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2.4.ebuild,v 1.5 2005/07/30 20:28:52 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.2.4.ebuild,v 1.6 2005/07/31 12:33:50 flameeyes Exp $
 
 inherit kde eutils
 
@@ -64,7 +64,7 @@ src_compile() {
 	# amarok does not respect kde coding standards, and makes a lot of
 	# assuptions regarding its installation directory. For this reason,
 	# it must be installed in the KDE install directory.
-	PREFIX="`kde-config --prefix`"
+	PREFIX="${KDEDIR}"
 
 	myconf="$(use_with arts) $(use_with xine)
 		$(use_with gstreamer) $(use_enable mysql)
diff --git a/media-sound/amarok/amarok-1.3_beta1.ebuild b/media-sound/amarok/amarok-1.3_beta1.ebuild
index b2ce8550be4e..d8a58b71488b 100644
--- a/media-sound/amarok/amarok-1.3_beta1.ebuild
+++ b/media-sound/amarok/amarok-1.3_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3_beta1.ebuild,v 1.3 2005/06/16 07:16:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3_beta1.ebuild,v 1.4 2005/07/31 12:33:50 flameeyes Exp $
 
 inherit kde eutils
 
@@ -66,7 +66,7 @@ src_compile() {
 	# amarok does not respect kde coding standards, and makes a lot of
 	# assuptions regarding its installation directory. For this reason,
 	# it must be installed in the KDE install directory.
-	PREFIX="`kde-config --prefix`"
+	PREFIX="${KDEDIR}"
 
 	local myconf="$(use_with arts) $(use_with xine) $(use_with gstreamer)
 	              $(use_enable mysql) $(use_enable postgres postgresql)
diff --git a/media-sound/amarok/amarok-1.3_beta2.ebuild b/media-sound/amarok/amarok-1.3_beta2.ebuild
index c7d0ec15634c..19084724dc20 100644
--- a/media-sound/amarok/amarok-1.3_beta2.ebuild
+++ b/media-sound/amarok/amarok-1.3_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3_beta2.ebuild,v 1.3 2005/07/10 17:14:48 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amarok/amarok-1.3_beta2.ebuild,v 1.4 2005/07/31 12:33:50 flameeyes Exp $
 
 inherit kde eutils
 
@@ -67,7 +67,7 @@ src_compile() {
 	# amarok does not respect kde coding standards, and makes a lot of
 	# assuptions regarding its installation directory. For this reason,
 	# it must be installed in the KDE install directory.
-	PREFIX="`kde-config --prefix`"
+	PREFIX="${KDEDIR}"
 
 	local myconf="$(use_with arts) $(use_with xine) $(use_with gstreamer)
 	              $(use_enable mysql) $(use_enable postgres postgresql)