Update for KDE 3.5.

2 files changed, 13 insertions, 24 deletions

diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass
index 14fd22cbcfa4..fd5e471898cc 100644
--- a/eclass/kde-dist.eclass
+++ b/eclass/kde-dist.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.67 2005/07/11 15:08:06 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.68 2005/08/24 22:54:14 greg_g Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -17,10 +17,8 @@ case "${PV}" in
 	2.2.2*)			SRC_PATH="2.2.2/src/${P}.tar.bz2" ;;
 	3.2.0)			SRC_PATH="stable/3.2/src/${P}.tar.bz2" ;;
 	3.3.0)			SRC_PATH="stable/3.3/src/${P}.tar.bz2" ;;
-	3.4.0_beta1)		SRC_PATH="unstable/3.3.91/src/${PN}-3.3.91.tar.bz2" ;;
-	3.4.0_beta2)		SRC_PATH="unstable/3.3.92/src/${PN}-3.3.92.tar.bz2" ;;
-	3.4.0_rc1)		SRC_PATH="unstable/3.4.0-rc1/src/${PN}-3.4.0-rc1.tar.bz2" ;;
 	3.4.0)			SRC_PATH="stable/3.4/src/${P}.tar.bz2" ;;
+	3.5_alpha1)		SRC_PATH="unstable/${PV/_/-}/src/${PN}-3.4.90.tar.bz2" ;;
 	3*)			SRC_PATH="stable/${PV}/src/${P}.tar.bz2" ;;
 	5)			SRC_URI="" # cvs ebuilds, no SRC_URI needed
 				debug-print "${ECLASS}: cvs detected" ;;
@@ -31,10 +29,8 @@ debug-print "${ECLASS}: finished, SRC_URI=${SRC_URI}"
 
 need-kde ${PV}
 
-# 3.4 prereleases
-[ "${PV}" == "3.4.0_beta1" ] && S=${WORKDIR}/${PN}-3.3.91
-[ "${PV}" == "3.4.0_beta2" ] && S=${WORKDIR}/${PN}-3.3.92
-[ "${PV}" == "3.4.0_rc1" ] && S=${WORKDIR}/${PN}-3.4.0
+# 3.5 prereleases
+[ "${PV}" == "3.5_alpha1" ] && S=${WORKDIR}/${PN}-3.4.90
 
 DESCRIPTION="KDE ${PV} - "
 HOMEPAGE="http://www.kde.org/"
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 4c4e59a78862..9b6f933b98ee 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.121 2005/08/08 10:38:10 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.122 2005/08/24 22:54:14 greg_g Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -646,18 +646,10 @@ need-kde() {
 			need-automake 1.6
 			need-autoconf 2.5
 			;;
-		3.2*)
+		3*)	# a generic call for need-kde 3 - automake 1.7 works most often
 			need-autoconf 2.5
 			need-automake 1.7
 			;;
-		3.4*)
-			need-autoconf 2.5
-			need-automake 1.7
-			;;
-		3*)	# a generic call for need-kde 3 - automake 1.4 works most often
-			need-autoconf 2.5
-			need-automake 1.4
-			;;
 		5*)
 			need-autoconf 2.5
 			need-automake 1.7
@@ -749,7 +741,9 @@ set-kdedir() {
 				3.2) export PREFIX="/usr/kde/3.2";;
 				3.3) export PREFIX="/usr/kde/3.3";;
 				3.4) export PREFIX="/usr/kde/3.4";;
+				3.5) export PREFIX="/usr/kde/3.5";;
 				5.0) export PREFIX="/usr/kde/cvs";;
+				*) die "failed to set PREFIX";;
 			esac
 		fi
 	fi
@@ -762,7 +756,7 @@ set-kdedir() {
 	else
 		if [ -z "$KDEBASE" ]; then
 			# find the latest kdelibs installed
-			for x in /usr/kde/{cvs,3.4,3.3,3.2,3.1,3.0,3} $PREFIX $KDE3LIBSDIR $KDELIBSDIR $KDE3DIR $KDEDIR /usr/kde/*; do
+			for x in /usr/kde/{cvs,3.5,3.4,3.3,3.2,3.1,3.0,3} $PREFIX $KDE3LIBSDIR $KDELIBSDIR $KDE3DIR $KDEDIR /usr/kde/*; do
 				if [ -f "${x}/include/kwin.h" ]; then
 					debug-print found
 					export KDEDIR="$x"
@@ -777,16 +771,13 @@ set-kdedir() {
 				3.2) export KDEDIR="/usr/kde/3.2";;
 				3.3) export KDEDIR="/usr/kde/3.3";;
 				3.4) export KDEDIR="/usr/kde/3.4";;
+				3.5) export KDEDIR="/usr/kde/3.5";;
 				5.0) export KDEDIR="/usr/kde/cvs";;
+				*) die "failed to set KDEDIR";;
 			esac
 		fi
 	fi
 
-
-	# check that we've set everything
-	[ -z "$PREFIX" ] && debug-print "$FUNCNAME: ERROR: could not set install prefix"
-	[ -z "$KDEDIR" ] && debug-print "$FUNCNAME: ERROR: couldn't set kdelibs location"
-
 	debug-print "$FUNCNAME: Will use the kdelibs installed in $KDEDIR, and install into $PREFIX."
 
 }
@@ -830,6 +821,7 @@ qtver-from-kdever() {
 		3.2*)	ver=3.2;;
 		3.3*)	ver=3.3;;
 		3.4*)	ver=3.3;;
+		3.5*)	ver=3.3;;
 		3*)	ver=3.0.5;;
 		5)	ver=3.3;; # cvs version
 		*)	echo "!!! error: $FUNCNAME called with invalid parameter: \"$1\", please report bug" && exit 1;;
@@ -850,6 +842,7 @@ min-kde-ver() {
 		3.2*)			selected_version="3.2";;
 		3.3*)			selected_version="3.3";;
 		3.4*)			selected_version="3.4";;
+		3.5*)			selected_version="3.5";;
 		3*)			selected_version="3.0";;
 		5)			selected_version="5";;
 		*)			echo "!!! error: $FUNCNAME() called with invalid parameter: \"$1\", please report bug" && exit 1;;