add support for upcoming kde-3.1-beta2

4 files changed, 15 insertions, 9 deletions

diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass
index adf00a8261ea..0ea2506ff412 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 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.20 2002/09/07 21:43:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.21 2002/09/24 17:54:19 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.
 inherit kde-base kde.org
@@ -13,12 +13,13 @@ need-kde $PV
 # 3.1 prereleases
 [ "$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
 
 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" != "5" ]; then
+if [ "$PV" != "3.1_alpha1" -a "$PV" != "3.1_beta1" -a "$PV" != "3.1_beta2" -a "$PV" != "5" ]; then
     myconf="$myconf --enable-final"
     debug-print "$ECLASS: added enable-final"
 fi
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 8306baf2608b..13ba500037f4 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.31 2002/09/10 19:15:48 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.32 2002/09/24 17:54:19 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"
@@ -291,6 +291,8 @@ min-kde-ver() {
 	    3.0)	selected_version="3.0";;
 	    3.0.*)	selected_version="3.0";;
 	    3.1_alpha1)	selected_version="3.1_alpha1";;
+	    3.1_beta1)	selected_version="3.1_alpha1";;
+	    3.1_beta2)	selected_version="3.1_alpha1";;
 	    3.1.*)	selected_version="3.1";;
 	    3*)		selected_version="3.0";;
 	    5)		selected_version="5";;
diff --git a/eclass/kde.eclass b/eclass/kde.eclass
index 80840102161b..df7545245671 100644
--- a/eclass/kde.eclass
+++ b/eclass/kde.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.eclass,v 1.58 2002/09/10 09:56:12 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.59 2002/09/24 17:54:20 danarmak Exp $
 # The kde eclass is inherited by all kde-* eclasses. Few ebuilds inherit straight from here.
 inherit base kde-functions
 ECLASS=kde
@@ -16,10 +16,12 @@ case $PN in
 		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
+		# already in kde-dist.eclass!
+		#case $PV in
+		#	3.1_alpha1)	export S="$WORKDIR/$PN-3.0.6" ;;
+		#	3.1_beta1)	export S="$WORKDIR/$PN-3.0.7" ;;
+		#	3.1_beta2)	export S="$WORKDIR/$PN-3.0.8" ;;
+		#esac
 
 	    ;;
 esac
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index d93c8dc95ea7..f95bf49dbf9a 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 or later
 # Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.org.eclass,v 1.15 2002/08/18 23:55:03 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.org.eclass,v 1.16 2002/09/24 17:54:20 danarmak Exp $
 # Contains the locations of ftp.kde.org packages and their mirrors
 ECLASS=kde.org
 INHERITED="$INHERITED $ECLASS"
@@ -12,6 +12,7 @@ case "$PV" in
     2.2.2)	SRC_PATH="Attic/2.2.2/src/${P}.tar.bz2" ;;
     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*)		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"