Touchups for kde-3.4.0_beta1.

diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass
index 31aebdd1c79ac10b645ec9a84f5385bc4362ef0b..c3a1745261450395bb775ca89440ac996420b303 100644 (file)
--- 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.58 2004/08/19 14:24:01 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.59 2005/01/13 16:56:11 greg_g Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -18,8 +18,8 @@ case "$PV" in
        2.2.2a)                 SRC_PATH="2.2.2/src/${PN}-${PV/a/}.tar.bz2" ;;
        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_rc2)              SRC_PATH="unstable/3.3.0rc2/src/${PN}-${PV/_/-}.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*)                     SRC_PATH="stable/$PV/src/${P}.tar.bz2" ;;
        5)                      SRC_URI="" # cvs ebuilds, no SRC_URI needed
                                debug-print "$ECLASS: cvs detected" ;;
@@ -30,8 +30,8 @@ debug-print "$ECLASS: finished, SRC_URI=$SRC_URI"
 
 need-kde $PV
 
-# 3.2 prereleases
-[ "$PV" == "3.3.0_rc2" ] && S=${WORKDIR}/${PN}-3.3.0
+# 3.4 prereleases
+[ "$PV" == "3.4.0_beta1" ] && S=${WORKDIR}/${PN}-3.3.91
 
 DESCRIPTION="KDE ${PV} - "
 HOMEPAGE="http://www.kde.org/"

diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index c83eae13ca549f5982d419abf5e4bb3afdda2984..6c1b37c87518ebdf2a429f6eac056a8c63859ad7 100644 (file)
--- 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.78 2004/12/29 19:56:46 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.79 2005/01/13 16:56:11 greg_g Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -10,11 +10,6 @@
 ECLASS=kde-functions
 INHERITED="$INHERITED $ECLASS"
 
-# since it's always possible, that kde_sandbox_patch() gets called, the dependency is needed
-# at least with the slotted autotools, we have the same problem identifying and adding the correct
-# dependency like with the need-kde/qt functions. this needs to be changed
-DEPEND="sys-apps/sed"
-
 # convinience functions for requesting autotools versions
 need-automake() {
 
@@ -441,8 +436,9 @@ qtver-from-kdever() {
                3.1*)   ver=3.1;;
                3.2*)   ver=3.2;;
                3.3*)   ver=3.3;;
+               3.4*)   ver=3.3;;
                3*)     ver=3.0.5;;
-               5)      ver=3.2;; # cvs version
+               5)      ver=3.3;; # cvs version
                *)      echo "!!! error: $FUNCNAME called with invalid parameter: \"$1\", please report bug" && exit 1;;
        esac
 
@@ -467,6 +463,8 @@ min-kde-ver() {
                3.0*)                   selected_version="3.0";;
                3.1*)                   selected_version="3.1";;
                3.2*)                   selected_version="3.2";;
+               3.3*)                   selected_version="3.3";;
+               3.4*)                   selected_version="3.4";;
                3*)                     selected_version="3.0";;
                5)                      selected_version="5";;
                *)                      echo "!!! error: $FUNCNAME() called with invalid parameter: \"$1\", please report bug" && exit 1;;