add support for the upcoming kde 3.5.0_beta2 ebuilds. this includes a workaround...

diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass
index 66196b89aca56e957bfc61d3bd07d93b5d2f7201..efcdec03cac72df01c8ce4f9c0685e8ffe580ec4 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.69 2005/09/21 15:32:24 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.70 2005/10/14 17:22:06 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -20,6 +20,7 @@ case "${PV}" in
        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.5_beta1)              SRC_PATH="unstable/${PV/_/-}/src/${PN}-3.4.91.tar.bz2" ;;
+       3.5_beta2)              SRC_PATH="unstable/${PV/_/-}/src/${PN}-3.4.92.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" ;;
@@ -33,6 +34,7 @@ need-kde ${PV}
 # 3.5 prereleases
 [ "${PV}" == "3.5_alpha1" ] && S=${WORKDIR}/${PN}-3.4.90
 [ "${PV}" == "3.5_beta1" ] && S=${WORKDIR}/${PN}-3.4.91
+[ "${PV}" == "3.5_beta2" ] && S=${WORKDIR}/${PN}-3.4.92
 
 DESCRIPTION="KDE ${PV} - "
 HOMEPAGE="http://www.kde.org/"

diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 69471a434ceddd7f05af3da1184ad21ddd5bff48..c1992d8429104754c193a7fe4f7f602909d7bf48 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.124 2005/09/24 09:36:29 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.125 2005/10/14 17:22:06 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -423,7 +423,18 @@ deprange-list() {
        # Assign, parse params
        local MINVER=$1; shift
        local MAXVER=$1; shift
+       
+       # Workaround for 3.5.0_beta1 ebuilds being mistakenly versioned as 3.5_beta1
+       # Ugly kludge, but will disappear once 3.5 prerelease ebuilds are removed from portage
+       if [ "$MINVER" == "3.5_beta1" ]; then
 
+               MINVER="3.5.0_beta1"
+               FINALOPTIONVER="3.5_beta1"
+       fi
+       if [ "$MAXVER" == "3.5_beta1" ]; then
+               MAXVER="3.5.0_beta1"
+       fi
+       
        # Get base version - the major X.Y components
        local BASEVER=${MINVER%.*}
        if [ "${MAXVER%.*}" != "$BASEVER" ]; then
@@ -506,7 +517,12 @@ deprange-list() {
                                                $(deprange-iterate-numbers $BASE ${MINREV#r} 99)"
                        fi
                fi
-
+               
+               # second part of kludge
+               if [ -n "$FINALOPTIONVER" ]; then
+                       NEWDEP="$NEWDEP ~$PACKAGE-$FINALOPTIONVER"
+               fi
+               
                # Output
                echo -n $NEWDEP
        done

diff --git a/eclass/kde-meta.eclass b/eclass/kde-meta.eclass
index edd0251172302d3e4497558b3111c279d641d080..b18b06dc0825bc7a8241e1b3f1e69632ba115e12 100644 (file)
--- a/eclass/kde-meta.eclass
+++ b/eclass/kde-meta.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-meta.eclass,v 1.51 2005/10/04 22:11:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-meta.eclass,v 1.52 2005/10/14 17:22:06 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 # Simone Gotti <motaboy@gentoo.org>
@@ -25,6 +25,7 @@ case "$PV" in
        3.4.0_rc1)              TARBALLDIRVER="3.4.0"; TARBALLVER="3.4.0-rc1" ;;
        3.5_alpha1)             TARBALLDIRVER="3.4.90"; TARBALLVER="3.4.90" ;;
        3.5_beta1)              TARBALLDIRVER="3.4.91"; TARBALLVER="3.4.91" ;;
+       3.5_beta2)              TARBALLDIRVER="3.4.92"; TARBALLVER="3.4.92" ;;
        *)                              TARBALLDIRVER="$PV"; TARBALLVER="$PV" ;;
 esac
 if [ "${KMNAME}" = "koffice" ]; then
@@ -80,6 +81,9 @@ if [ "$KDEBASE" = "true" ]; then
                3.4.2)          XDELTA_BASE="stable/3.4/src/$KMNAME-3.4.0.tar.bz2"
                                XDELTA_DELTA="stable/3.4.1/src/$KMNAME-3.4.0-3.4.1.tar.xdelta stable/3.4.2/src/$KMNAME-3.4.1-3.4.2.tar.xdelta"
                                ;;
+               3.5.0_beta2)    XDELTA_BASE="unstable/3.4.91/src/$KMNAME-3.4.91.tar.bz2"
+                               XDELTA_DELTA="unstable/3.4.92/src/$KMNAME-3.4.91-3.4.91.tar.xdelta"
+                               ;;
                *)              ;;
        esac