changes necessary for kde 3.1 rc1

4 files changed, 25 insertions, 20 deletions

diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass
index 1ba60bf38809..c89e9c35c6d0 100644
--- a/eclass/kde-dist.eclass
+++ b/eclass/kde-dist.eclass
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.26 2002/10/27 11:12:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.27 2002/10/31 10:55:08 danarmak Exp $
 # This is the kde-dist eclass for >=2.2.1 kde base packages. Don't use for kdelibs though :-)
 # Don't use it for e.g. kdevelop, koffice because of their separate versionnig schemes.
 
@@ -15,12 +15,13 @@ need-kde $PV
 [ "$PV" == "3.1_alpha1" ] && S=${WORKDIR}/${PN}-3.0.6
 [ "$PV" == "3.1_beta1" ] && S=${WORKDIR}/${PN}-3.0.7
 [ "$PV" == "3.1_beta2" ] && S=${WORKDIR}/${PN}-3.0.8
+[ "$PV" == "3.1_rc1" ] && S=${WORKDIR}/${PN}-3.0.9
 
 DESCRIPTION="KDE ${PV} - "
 HOMEPAGE="http://www.kde.org/"
 
 # doesn't work well for unstable versions
-if [ "$PV" != "3.1_alpha1" -a "$PV" != "3.1_beta1" -a "$PV" != "3.1_beta2" -a "$PV" != "5" ]; then
+if [ "$PV" != "3.1_alpha1" -a "$PV" != "3.1_beta1" -a "$PV" != "3.1_beta2" -a "$PV" != "3.1_rc1" -a "$PV" != "5" ]; then
     set_enable_final
 fi
 
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 50691eb536d1..ae9e0ed904f8 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
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.36 2002/10/27 10:37:52 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.37 2002/10/31 10:55:08 danarmak Exp $
 # This contains everything except things that modify ebuild variables and functions (e.g. $P, src_compile() etc.)
 
 ECLASS=kde-functions
@@ -226,7 +226,7 @@ need-qt() {
 
 	case $QTVER in
 	    2*)	newdepend "=x11-libs/${QT}-2.3*" ;;
-	    3*)	newdepend ">=x11-libs/${QT}-3" ;;
+	    3*)	newdepend ">=x11-libs/${QT}-${QTVER}" ;;
 	    *)	echo "!!! error: $FUNCNAME() called with invalid parameter: \"$QTVER\", please report bug" && exit 1;;
 	esac
 
@@ -386,21 +386,21 @@ kde_remove_dir(){
 # return the $1th parameter, starting from $2
 get_param() {
 
-    num=$1
+	num=$1
 
-    for x in `seq $num`; do shift; done
-    echo "$1"
+	for x in `seq $num`; do shift; done
+	echo "$1"
 
 }
 
 # return total amount of free memory (ram+swap) assuming /proc/meminfo exists and is readable
 get_free_mem() {
 
-    free_ram=`get_param 2 \`grep MemFree /proc/meminfo\``
-    free_swap=`get_param 2 \`grep SwapFree /proc/meminfo\``
-    declare -i total
-    total=$free_ram+$free_swap
-    echo $total
+	free_ram=`get_param 2 \`grep MemFree /proc/meminfo\``
+	free_swap=`get_param 2 \`grep SwapFree /proc/meminfo\``
+	declare -i total
+	total=$free_ram+$free_swap
+	echo $total
 
 }
 
@@ -409,12 +409,14 @@ get_free_mem() {
 # is only called by ebuilds (& kde-dist.eclass) that actually support enable-final!
 set_enable_final() {
 
-    # current limit is 200,000 kB
-    if [ "`get_free_mem`" -ge 200000 ]; then
-	myconf="$myconf --enable-final"
-    else
-	myconf="$myconf --disable-final" # just to be sure :-)
-    fi
+	# current limit is 200,000 kB
+	if [ "`get_free_mem`" -ge 200000 ]; then
+		debug-print "$FUNCNAME: enable-final ON"
+		myconf="$myconf --enable-final"
+	else
+		debug-print "$FUNCNAME: enable-final OFF"
+		myconf="$myconf --disable-final" # just to be sure :-)
+	fi
 
 }
 
diff --git a/eclass/kde-i18n.eclass b/eclass/kde-i18n.eclass
index 8611ebfffaa9..5cc8d5190c15 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
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.28 2002/10/27 11:12:02 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.29 2002/10/31 10:55:08 danarmak Exp $
 
 inherit kde
 ECLASS=kde-i18n
@@ -23,6 +23,7 @@ case "$PV" in
 	2.2.2)		SRC_PATH="stable/${PV}/src/${P}.tar.bz2" ;;
 	3.1_beta1)	SRC_PATH="unstable/kde-3.1-beta1/src/kde-i18n/${P//3.1_beta1/3.0.7}.tar.bz2" ;;
 	3.1_beta2)	SRC_PATH="unstable/kde-3.1-beta2/src/kde-i18n/${P//3.1_beta2/3.0.8}.tar.bz2" ;;
+	3.1_rc1)	SRC_PATH="unstable/kde-3.1-beta2/src/kde-i18n/${P//3.1_beta2/3.0.9}.tar.bz2" ;;
 	3*)			SRC_PATH="stable/${PV}/src/kde-i18n/${P}.tar.bz2" ;;
 esac
 
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 4696bb96daea..6a8062e1d5ef 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.org.eclass,v 1.18 2002/10/25 19:55:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.org.eclass,v 1.19 2002/10/31 10:55:07 danarmak Exp $
 # Contains the locations of ftp.kde.org packages and their mirrors
 
 ECLASS=kde.org
@@ -14,6 +14,7 @@ case "$PV" in
 	3.1_alpha1)		SRC_PATH="unstable/kde-3.1-alpha1/src/${P//3.1_alpha1/3.0.6}.tar.bz2" ;;
 	3.1_beta1)		SRC_PATH="unstable/kde-3.1-beta1/src/${P//3.1_beta1/3.0.7}.tar.bz2" ;;
 	3.1_beta2)		SRC_PATH="unstable/kde-3.1-beta2/src/${P//3.1_beta2/3.0.8}.tar.bz2" ;;
+	3.1_rc1)		SRC_PATH="unstable/kde-3.1-rc1/src/${P//3.1_rc1/3.0.9}.tar.bz2" ;;
 	3*)				SRC_PATH="stable/$PV/src/${P}.tar.bz2" ;;
 	5)					SRC_URI="" # cvs ebuilds, no SRC_URI needed
 		debug-print "$ECLASS: finished, cvs detected, SRC_URI=$SRC_URI"