diff options
| -rw-r--r-- | eclass/kde-dist.eclass | 20 | ||||
| -rw-r--r-- | eclass/kde-functions.eclass | 8 |
2 files changed, 16 insertions, 12 deletions
diff --git a/eclass/kde-dist.eclass b/eclass/kde-dist.eclass index bdf95f2d930c..a3c2f85b81ed 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.41 2003/04/28 02:46:51 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-dist.eclass,v 1.42 2003/09/12 02:22:46 caleb Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -17,13 +17,13 @@ case "$PV" in 1*) SRC_PATH="stable/3.0.2/src/${P}.tar.bz2";; # backward compatibility for unmerging ebuilds 2.2.2a) SRC_PATH="2.2.2/src/${PN}-${PV/a/}.tar.bz2" ;; 2.2.2*) SRC_PATH="2.2.2/src/${P}.tar.bz2" ;; - 3.1_alpha1) SRC_PATH="unstable/kde-3.1-alpha1/src/${P//3.1_alpha1/3.0.6}.tar.bz2" ;; - 3.1_beta1) SRC_PATH="unstable/kde-3.1-beta1/src/${P//3.1_beta1/3.0.7}.tar.bz2" ;; - 3.1_beta2) SRC_PATH="unstable/kde-3.1-beta2/src/${P//3.1_beta2/3.0.8}.tar.bz2" ;; - 3.1_rc1) SRC_PATH="unstable/kde-3.1-rc1/src/${P//3.1_rc1/3.0.9}.tar.bz2" ;; - 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.2_alpha1) SRC_PATH="unstable/3.1.91/src/${P//3.2_alpha1/3.1.91}.tar.bz2" ;; + 3.2_beta1) SRC_PATH="unstable/kde-3.1-beta1/src/${P//3.1_beta1/3.0.7}.tar.bz2" ;; + 3.2_beta2) SRC_PATH="unstable/kde-3.1-beta2/src/${P//3.1_beta2/3.0.8}.tar.bz2" ;; + 3.2_rc1) SRC_PATH="unstable/kde-3.1-rc1/src/${P//3.1_rc1/3.0.9}.tar.bz2" ;; + 3.2_rc2) SRC_PATH="unstable/kde-3.1-rc2/src/${P//3.1_rc2/3.0.98}.tar.bz2" ;; + 3.2_rc3) SRC_PATH="unstable/kde-3.1-rc3/src/${P//3.1_rc3/3.0.99}.tar.bz2" ;; + 3.2_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.1.1a) SRC_PATH="stable/$PV/src/${PN}-3.1.1.tar.bz2" SRC_URI="$SRC_URI mirror://gentoo/${PN}-${PVR}.diff.bz2" ;; @@ -37,8 +37,8 @@ debug-print "$ECLASS: finished, SRC_URI=$SRC_URI" need-kde $PV -# 3.1 prereleases -[ "$PV" == "3.1_alpha1" ] && S=${WORKDIR}/${PN}-3.0.6 +# 3.2 prereleases +[ "$PV" == "3.2_alpha1" ] && S=${WORKDIR}/${PN}-3.1.91 [ "$PV" == "3.1_beta1" ] && S=${WORKDIR}/${PN}-3.0.7 [ "$PV" == "3.1_beta2" ] && S=${WORKDIR}/${PN}-3.0.8 [ "$PV" == "3.1_rc1" ] && S=${WORKDIR}/${PN}-3.0.9 diff --git a/eclass/kde-functions.eclass b/eclass/kde-functions.eclass index ae35f709897c..faded572634c 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.62 2003/09/12 02:02:53 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde-functions.eclass,v 1.63 2003/09/12 02:22:46 caleb Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -63,7 +63,7 @@ need-kde() { need-autoconf 2.1 need-automake 1.4 ;; - 3.1.[23]) # Newer 3.1.x versions are built with automake 1.7, and have errors when using 1.6 + 3.1.[234]) # Newer 3.1.x versions are built with automake 1.7, and have errors when using 1.6 need-automake 1.7 need-autoconf 2.5 ;; @@ -71,6 +71,10 @@ need-kde() { need-automake 1.6 need-autoconf 2.5 ;; + 3.2*) + need-autoconf 2.5 + need-automake 1.7 + ;; 3*) # a generic call for need-kde 3 - automake 1.4 works most often need-autoconf 2.5 need-automake 1.4 |