needed support for new kde 3.1.1a stuff. shouldn't touch anything else.

5 files changed, 24 insertions, 9 deletions

diff --git a/eclass/base.eclass b/eclass/base.eclass
index 35397550fc24..570630bc6d7c 100644
--- a/eclass/base.eclass
+++ b/eclass/base.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.22 2003/02/28 09:15:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/base.eclass,v 1.23 2003/04/08 17:48:12 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -33,12 +33,16 @@ base_src_unpack() {
 			;;
 		autopatch)
 			debug-print-section autopatch
-			debug-print "$FUNCNAME: autopatch: PATCHES=$PATCHES"
+			debug-print "$FUNCNAME: autopatch: PATCHES=$PATCHES, PATCHES1=$PATCHES1"
 			cd ${S}
 			for x in $PATCHES; do
 				debug-print "$FUNCNAME: autopatch: patching from ${x}"
 				patch -p0 < ${x}
 			done
+			for x in $PATCHES1; do
+				debug-print "$FUNCNAME: autopatch: patching -p1 from ${x}"
+				patch -p1 < ${x}
+			done
 			;;
 	        all)
 			debug-print-section all
diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass
index e141cc41edd5..b7adaf477ac7 100644
--- a/eclass/kde-dist.eclass
+++ b/eclass/kde-dist.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.36 2003/02/28 09:15:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.37 2003/04/08 17:48:12 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -23,6 +23,12 @@ need-kde $PV
 [ "$PV" == "3.1_rc5" ] && S=${WORKDIR}/${PN}-3.1rc5
 [ "$PV" == "3.1_rc6" ] && S=${WORKDIR}/${PN}-3.1rc6
 
+# these use incrememntal patches so as to avoid downloadnig a lot of stuff all over
+if [ "$PV" == "3.1.1a" ]; then
+    PATCHES1="$PATCHES1 ${WORKDIR}/${P}.diff"
+    export S="${WORKDIR}/${PN}-3.1.1"
+fi
+
 DESCRIPTION="KDE ${PV} - "
 HOMEPAGE="http://www.kde.org/"
 
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index bb4229e8e79a..37a51ce22c37 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.53 2003/02/16 04:26:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.54 2003/04/08 17:48:12 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -90,6 +90,8 @@ need-kde() {
 		# maybe i should look at relocating it...
 		if [ "$PV" == "3.0.3" ]; then
 			newdepend "=kde-base/kdelibs-3.0.3*"
+		elif [ "$PV" == "3.1.1" ]; then
+			newdepend "=kde-base/kdelibs-3.1.1*"
 		elif [ "$PV" == "2.2.2" ]; then
 			newdepend "=kde-base/kdelibs-2.2.2*"
 		else
diff --git a/eclass/kde-source.eclass b/eclass/kde-source.eclass
index f4fc1d224f11..bf1037880247 100644
--- a/eclass/kde-source.eclass
+++ b/eclass/kde-source.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.13 2003/02/16 04:26:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-source.eclass,v 1.14 2003/04/08 17:48:12 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -31,6 +31,7 @@ INHERITED="$INHERITED $ECLASS"
 # Format example: "anoncvs.kde.org:/home/kde" (without :pserver:anonymous@ part)
 # Mirror list is available at http://developer.kde.org/source/anoncvs.html
 [ -z "$ECVS_SERVER" ] && ECVS_SERVER="anoncvs.kde.org:/home/kde"
+[ -z "$ECVS_AUTH" ] && ECVS_AUTH="pserver"
 
 # default for kde-base ebuilds
 [ -z "$ECVS_MODULE" ] && ECVS_MODULE="$PN"
@@ -46,7 +47,7 @@ ECLASS=kde-source
 
 # --- end user-configurable settings ---
 
-S="$WORKDIR/$ECVS_MODULE" 
+S="$WORKDIR/$ECVS_MODULE"
 
 DESCRIPTION="$DESCRIPTION (cvs) "
 
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index c1ddb6014433..c10670a18e75 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.org.eclass,v 1.26 2003/02/16 04:26:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.org.eclass,v 1.27 2003/04/08 17:48:12 danarmak Exp $
 #
 # Author Dan Armak <danarmak@gentoo.org>
 #
@@ -22,13 +22,15 @@ case "$PV" in
 	3.1_rc3)		SRC_PATH="unstable/kde-3.1-rc3/src/${P//3.1_rc3/3.0.99}.tar.bz2" ;;
 	3.1_rc5)		SRC_PATH="unstable/kde-3.1-rc5/src/${P//_}.tar.bz2" ;;
 	3.1_rc6)		SRC_PATH="unstable/kde-3.1-rc6/src/${P//_}.tar.bz2" ;;
-	3*)				SRC_PATH="stable/$PV/src/${P}.tar.bz2" ;;
+	3.1.1a)			SRC_PATH="stable/$PV/src/${PN}-3.1.1.tar.bz2"
+				SRC_URI="$SRC_URI mirror://gentoo/${P}.diff.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"
 		return 0 ;; 
 	*)		debug-print "$ECLASS: Error: unrecognized version $PV, could not set SRC_URI" ;;
 esac
 
-SRC_URI="mirror://kde/$SRC_PATH"
+SRC_URI="$SRC_URI mirror://kde/$SRC_PATH"
 
 debug-print "$ECLASS: finished, SRC_URI=$SRC_URI"