summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Armak <danarmak@gentoo.org>2005-10-14 17:22:06 +0000
committerDan Armak <danarmak@gentoo.org>2005-10-14 17:22:06 +0000
commit216438caa13ee32892e0ee4a5fc9a1e986c5e6a5 (patch)
treec57318fa258fb6d813ea62fbb8fab0a03849a1fa /eclass/kde-functions.eclass
parentVersion bump; tidy old version. (diff)
downloadhistorical-216438caa13ee32892e0ee4a5fc9a1e986c5e6a5.tar.gz
historical-216438caa13ee32892e0ee4a5fc9a1e986c5e6a5.tar.bz2
historical-216438caa13ee32892e0ee4a5fc9a1e986c5e6a5.zip
add support for the upcoming kde 3.5.0_beta2 ebuilds. this includes a workaround in kde-functions.eclass:deprange() due to the fact that previous 3.5 prereleases were mistakenly versioned as eg 3.5_beta1 not 3.5.0_beta1.
Diffstat (limited to 'eclass/kde-functions.eclass')
-rw-r--r--eclass/kde-functions.eclass20
1 files changed, 18 insertions, 2 deletions
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 69471a434ced..c1992d842910 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.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