Use ${KDEDIR} instead of kde-config to set PREFIX as it's not in path during src_compile().

(Portage version: 2.0.51.22-r2)

5 files changed, 14 insertions, 9 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/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)