[gentoo-commits] gentoo-x86 commit in eclass: kde4-base.eclass

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    08/10/11 03:05:37

  Modified:             kde4-base.eclass
  Log:
  As we moved KDEDIR setting to pkg_setup, we can't set PREFIX to it in global scope.
  Furthermore, now that we have kdeprefix, set PREFIX to KDEDIR in pkg_setup and so make
  the install location dependent on kdeprefix for all packages that inherit kde4-base.

Revision  Changes    Path
1.15                 eclass/kde4-base.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/kde4-base.eclass?r1=1.14&r2=1.15

Index: kde4-base.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kde4-base.eclass	4 Oct 2008 14:51:02 -0000	1.14
+++ kde4-base.eclass	11 Oct 2008 03:05:37 -0000	1.15
@@ -1,6 +1,6 @@
 # Copyright 2007-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.14 2008/10/04 14:51:02 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.15 2008/10/11 03:05:37 jmbsvicetto Exp $
 
 # @ECLASS: kde4-base.eclass
 # @MAINTAINER:
@@ -388,13 +388,10 @@
 				;;
 		esac
 	fi
-	
-	if [[ -n ${KDEBASE} ]]; then
-		PREFIX=${KDEDIR}
-	else
-		# if PREFIX is not defined we set it to the default value of /usr
-		PREFIX="${PREFIX:-/usr}"
-	fi
+
+	# Set the prefix based on KDEDIR
+	# Make it a consequence of kdeprefix
+	PREFIX=${KDEDIR}
 
 	unset _kdedir