From: Diego Elio Pettenò <flameeyes@gentoo.org>
Date: Tue, 6 Jun 2006 22:19:13 +0000 (+0000)
Subject: Re-apply the last changes now that kmail and konq-plugins are fixed.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cad1b94a7d4f74c5608eb71f1ffaa5ac688e7d7b;p=gentoo.git

Re-apply the last changes now that kmail and konq-plugins are fixed.
---

diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index 14220f9f775b..d1b9a479febd 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.139 2006/06/06 16:40:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.140 2006/06/06 22:19:13 flameeyes Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -488,7 +488,7 @@ deprange-list() {
 			# Revision constraint on lower bound
 			if [ -n "$MINREV" ]; then
 				NEWDEP="$NEWDEP
-						$(deprange-iterate-numbers "=$PACKAGE-$BASEVER.${MINMINOR}_$MINSUFFIX-r" $MINREV 99)"
+						$(deprange-iterate-numbers "=$PACKAGE-$BASEVER.${MINMINOR}_$MINSUFFIX-r" $MINREV 50)"
 			fi
 
 		# If the minor version numbers are different too
@@ -499,12 +499,14 @@ deprange-list() {
 				NEWDEP="$(deprange-iterate-suffixes "~$PACKAGE-$BASEVER.$MAXMINOR" alpha1 $MAXSUFFIX)"
 			fi
 
+			STARTMINOR="${MINMINOR}"
+
 			# regular versions in between
 			if [ -n "$MINREV" -a -z "$MINSUFFIX" ]; then
-				let MAXMINOR++
+				let STARTMINOR++
 			fi
 			NEWDEP="$NEWDEP
-					$(deprange-iterate-numbers "~${PACKAGE}-${BASEVER}." $MINMINOR $MAXMINOR)"
+					$(deprange-iterate-numbers "~${PACKAGE}-${BASEVER}." $STARTMINOR $MAXMINOR)"
 
 			# Min version's allowed suffixes
 			if [ -n "$MINSUFFIX" ]; then
@@ -519,7 +521,7 @@ deprange-list() {
 					BASE="=$PACKAGE-$BASEVER.${MINMINOR%-r*}-r"
 				fi
 				NEWDEP="$NEWDEP
-						$(deprange-iterate-numbers $BASE ${MINREV#r} 99)"
+						$(deprange-iterate-numbers $BASE ${MINREV#r} 50)"
 			fi
 		fi