summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eclass/kde-dist.eclass3
-rw-r--r--eclass/kde-functions.eclass5
-rw-r--r--eclass/kde-i18n.eclass3
-rw-r--r--eclass/kde.org.eclass3
4 files changed, 8 insertions, 6 deletions
diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass
index 5dbf7550ef75..60afb294aa75 100644
--- a/eclass/kde-dist.eclass
+++ b/eclass/kde-dist.eclass
@@ -1,7 +1,7 @@
# Copyright 1999-2000 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
# Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.32 2002/12/08 15:34:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.33 2003/01/05 12:41:49 hannes Exp $
# This is the kde-dist eclass for >=2.2.1 kde base packages. Don't use for kdelibs though :-)
# Don't use it for e.g. kdevelop, koffice because of their separate versionnig schemes.
@@ -19,6 +19,7 @@ need-kde $PV
[ "$PV" == "3.1_rc2" ] && S=${WORKDIR}/${PN}-3.0.98
[ "$PV" == "3.1_rc3" ] && S=${WORKDIR}/${PN}-3.0.99
[ "$PV" == "3.1_rc5" ] && S=${WORKDIR}/${PN}-3.1rc5
+[ "$PV" == "3.1_rc6" ] && S=${WORKDIR}/${PN}-3.1rc6
DESCRIPTION="KDE ${PV} - "
HOMEPAGE="http://www.kde.org/"
diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass
index ca492bf505e8..10e86d4d9b73 100644
--- a/eclass/kde-functions.eclass
+++ b/eclass/kde-functions.eclass
@@ -1,7 +1,7 @@
# Copyright 1999-2000 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
# Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.49 2002/12/08 15:34:51 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.50 2003/01/05 12:41:49 hannes Exp $
# This contains everything except things that modify ebuild variables and functions (e.g. $P, src_compile() etc.)
ECLASS=kde-functions
@@ -245,8 +245,6 @@ qtver-from-kdever() {
case $1 in
2*) ver=2.3.1;;
- 3.1_rc2) ver=3.1_pre20021104;;
- 3.1_*) ver=3.1_pre20021024;; # kde 3.1 prereleases
3.1*) ver=3.1;;
3*) ver=3.0.5;;
5) ver=3.1;; # cvs version
@@ -285,6 +283,7 @@ min-kde-ver() {
3.1_rc2) selected_version="3.1_rc2";;
3.1_rc3) selected_version="3.1_rc3";;
3.1_rc5) selected_version="3.1_rc5";;
+ 3.1_rc6) selected_version="3.1_rc6";;
3.1.*) selected_version="3.1";;
3*) selected_version="3.0";;
5) selected_version="5";;
diff --git a/eclass/kde-i18n.eclass b/eclass/kde-i18n.eclass
index 5763f434f898..477cae30b3ba 100644
--- a/eclass/kde-i18n.eclass
+++ b/eclass/kde-i18n.eclass
@@ -1,7 +1,7 @@
# Copyright 1999-2000 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
# Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.37 2002/12/21 14:54:43 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde-i18n.eclass,v 1.38 2003/01/05 12:41:49 hannes Exp $
inherit kde
ECLASS=kde-i18n
@@ -23,6 +23,7 @@ case "$PV" in
3.1_rc1) RPV=3.0.9;;
3.1_rc2) RPV=3.0.98;;
3.1_rc5) RPV=3.1rc5;;
+ 3.1_rc6) RPV=3.1rc6;;
*) RPV=$PV;;
esac
RP="$PN-$RPV"
diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass
index 52c52b8d9f55..f7b47204d2d2 100644
--- a/eclass/kde.org.eclass
+++ b/eclass/kde.org.eclass
@@ -1,7 +1,7 @@
# Copyright 1999-2000 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
# Author Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde.org.eclass,v 1.24 2002/12/22 15:40:58 hannes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde.org.eclass,v 1.25 2003/01/05 12:41:49 hannes Exp $
# Contains the locations of ftp.kde.org packages and their mirrors
ECLASS=kde.org
@@ -19,6 +19,7 @@ case "$PV" in
3.1_rc2) SRC_PATH="unstable/kde-3.1-rc2/src/${P//3.1_rc2/3.0.98}.tar.bz2" ;;
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" ;;
5) SRC_URI="" # cvs ebuilds, no SRC_URI needed
debug-print "$ECLASS: finished, cvs detected, SRC_URI=$SRC_URI"