fix slots and install locations for kde-i18n ebuilds; some other fixes

4 files changed, 48 insertions, 29 deletions

diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 3774e450ebe6..26267de86e75 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.22 2002/08/13 12:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.23 2002/08/14 19:45:05 danarmak Exp $
 # This contains everything except things that modify ebuild variables and functions (e.g. $P, src_compile() etc.)
 ECLASS=kde-functions
 INHERITED="$INHERITED $ECLASS"
@@ -47,21 +47,30 @@ need-kde() {
 
 	debug-print-function $FUNCNAME $*
 	KDEVER="$1"
+
+	# determine install locations
+	set-kdedir $KDEVER
 	
 	# if we're a kde-base package, we need an exact version of kdelibs
 	# to compile correctly.
 	if [ "${INHERITED//kde-dist}" != "$INHERITED" ]; then
-	    newdepend "~kde-base/kdelibs-${KDEVER}"
-	    set-kdedir $KDEVER
+		newdepend "~kde-base/kdelibs-${KDEVER}"
+	elif [ -n "$KDEAPPENDAGE" ]; then
+		# special status - installs into $KDEDIR not $PREFIX
+		# and needs an exact minor version of kde.
+		# this exists for stuff that is part of a kde-base package,
+		# but also has older standalone ebuilds which must then go
+		# into the older kde's directory and cannot work with the
+		# newer kde.
+		newdepend "=kde-base/kdelibs-${KDEVER}*"
+		export PREFIX="$KDEDIR"
 	else
-	    # everyone else only needs a minimum version	
-	    set-kdedir $KDEVER
-	    
-	    if [ "$KDEMAJORVER" == "2" ]; then
-		newdepend "=kde-base/kdelibs-2.2*"
-	    else
-		min-kde-ver $KDEVER
-		newdepend ">=kde-base/kdelibs-${selected_version}"
+		# everything else only needs a minimum version	
+		if [ "$KDEMAJORVER" == "2" ]; then
+			newdepend "=kde-base/kdelibs-2.2*"
+		else
+			min-kde-ver $KDEVER
+			newdepend ">=kde-base/kdelibs-${selected_version}"
 	    fi
 	fi
 
@@ -69,11 +78,7 @@ need-kde() {
 	need-qt $selected_version
 	
 	if [ -n "$KDEBASE" ]; then
-	    #if [ "$PV" = "5" ]; then
-	    #	SLOT="cvs"
-	    #else
 	    SLOT="$KDEMAJORVER.$KDEMINORVER"
-	    #fi
 	else
 	    SLOT="0"
 	fi
@@ -192,7 +197,7 @@ set-kdedir() {
 	#[ "${INHERITED//kde-dist}" != "${INHERITED}" -a -z "$KDEDIR" ] && die "$ECLASS: Error: couldn't set kdelibs location, consult log"
 	[ -z "$KDEDIR" ] && die "$FUNCNAME: Error: couldn't set kdelibs location, consult log"
 
-	debug-print "$FUNCNAME: Will use the kdelibs installed in $KDEDIR, and install into $PREFIX."
+	einfo "$FUNCNAME: Will use the kdelibs installed in $KDEDIR, and install into $PREFIX."
 
 }
 
@@ -203,7 +208,7 @@ need-qt() {
 
 	case $QTVER in
 	    2*)	newdepend "=x11-libs/qt-2.3*" ;;
-	    3*)	newdepend ">=x11-libs/qt-3.0.4" ;;
+	    3*)	newdepend ">=x11-libs/qt-3" ;;
 	    *)	echo "!!! error: $FUNCNAME() called with invalid parameter: \"$QTVER\", please report bug" && exit 1;;
 	esac
 
@@ -237,8 +242,8 @@ qtver-from-kdever() {
 
 	case $1 in
 		2*)	ver=2.3.1;;
-		3*)	ver=3.0.3;;
-		5)	ver=3.0.3;; # cvs version
+		3*)	ver=3.0.4;;
+		5)	ver=3.0.4;; # cvs version
 		*)	echo "!!! error: $FUNCNAME called with invalid parameter: \"$1\", please report bug" && exit 1;;
 	esac
 
diff --git a/eclass/kde-i18n.eclass b/eclass/kde-i18n.eclass
index 10359b35e13a..6c335dc8db7e 100644
--- a/eclass/kde-i18n.eclass
+++ b/eclass/kde-i18n.eclass
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.21 2002/08/01 18:57:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.22 2002/08/14 19:45:05 danarmak Exp $
 inherit kde kde-i18n.org 
 ECLASS=kde-i18n
 INHERITED="$INHERITED $ECLASS"
@@ -9,11 +9,11 @@ INHERITED="$INHERITED $ECLASS"
 S=${WORKDIR}/${PN}
 DESCRIPTION="KDE ${PV} - i18n: ${PN}"
 HOMEPAGE="http://www.kde.org/"
-
 LICENSE="GPL-2"
-
 KEYWORDS="x86 ppc"
 
+SLOT="$KDEMAJORVER.$KDEMINORVER"
+
 myconf="$myconf --enable-final"
 
 need-kde ${PV}
diff --git a/eclass/kde-source.eclass b/eclass/kde-source.eclass
index f8ac006434e4..b20bec89cdb7 100644
--- a/eclass/kde-source.eclass
+++ b/eclass/kde-source.eclass
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.7 2002/08/12 09:40:25 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.8 2002/08/14 19:45:05 danarmak Exp $
 
 # This is for kde-base cvs ebuilds. Read comments about settings.
 # It uses $S and sets $SRC_URI, so inherit it as late as possible (certainly after any other eclasses).
@@ -82,7 +82,7 @@ kde-source_src_unpack() {
 	# which is also needed
 	if [ ! -d "$S/admin" ]; then
 		ECVS_MODULE="kde-common" ECVS_SUBDIR="admin" cvs_src_unpack
-    	mv ${WORKDIR}/kde-common/admin $WORKDIR/$ECVS_MODULE
+        	mv ${WORKDIR}/kde-common/admin $WORKDIR/$ECVS_MODULE
 	fi
 
 	# make sure we give them a clean cvs checkout
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index a109b8e7a7e3..709af03e94af 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.eclass
@@ -1,22 +1,36 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.52 2002/08/13 12:24:34 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.53 2002/08/14 19:45:05 danarmak Exp $
 # The kde eclass is inherited by all kde-* eclasses. Few ebuilds inherit straight from here.
 inherit base kde-functions
 ECLASS=kde
 INHERITED="$INHERITED $ECLASS"
 
-newdepend /autotools
+# is this a kde-base ebuid?
+case $PN in
+	kde-i18n*|arts|kdeaddons|kdeadmin|kdeartwork|kdebase|kdebindings|kdeedu|kdegames|kdegraphics|kdelibs|kdenetwork|kdepim|kdesdk|kdetoys|kdeutils)
+		
+		debug-print "$ECLASS: KDEBASE ebuild recognized"
+	
+		export KDEBASE="true"
+		
+		# fixups for certain versions
+		case $PV in
+			3.1_alpha1)	export S="$WORKDIR/$PN-3.0.6" ;;
+			3.1_beta1)	export S="$WORKDIR/$PN-3.0.7" ;;
+		esac
+
+	    ;;
+esac
 
+newdepend /autotools
 newdepend "~kde-base/kde-env-3"
 
 DESCRIPTION="Based on the $ECLASS eclass"
-
 HOMEPAGE="http://www.kde.org/"
 
-
-# overridden in other places like ked-dist, kde-source and individual ebuilds
+# overridden in other places like kde-dist, kde-source and individual ebuilds
 SLOT="0"
 
 kde_src_compile() {