diff options
| author |   Theo Chatzimichos <tampakrap@gentoo.org> | 2011-06-09 21:05:45 +0000 |
|---|---|---|
| committer | Theo Chatzimichos <tampakrap@gentoo.org> | 2011-06-09 21:05:45 +0000 |
| commit | 8dcfa57ba5e2566c6ad8819059c907029a4015b9 (patch) | |
| tree | cc4a88140802b424b05cf4d4c9cfda323c053005 /eclass | |
| parent | Do not allow pollution of CLIBS variable. Fixes bug #370463. (diff) | |
| download | gentoo-2-8dcfa57ba5e2566c6ad8819059c907029a4015b9.tar.gz gentoo-2-8dcfa57ba5e2566c6ad8819059c907029a4015b9.tar.bz2 gentoo-2-8dcfa57ba5e2566c6ad8819059c907029a4015b9.zip | |
Update KDE eclasses, add support for KDEPIM 4.6.0
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 10 | ||||
| -rw-r--r-- | eclass/kde4-meta-pkg.eclass | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index c81337a1e630..ba8c75534b49 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.97 2011/06/07 20:11:04 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.98 2011/06/09 21:05:45 tampakrap Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: @@ -167,7 +167,7 @@ case ${KDEBASE} in # Only add the kdeprefix USE flag for older versions, to help # non-portage package managers handle the upgrade - if [[ ${PV} < 4.6.4 ]]; then + if [[ ${PV} < 4.6.4 && ( ( ${KMNAME} != kdepim && ${PN} != kdepim-runtime ) || ${PV} < 4.6 ) ]]; then IUSE+=" kdeprefix" fi @@ -445,13 +445,11 @@ _calculate_src_uri() { # KDEPIM IS SPECIAL [[ ${KMNAME} == "kdepim" || ${KMNAME} == "kdepim-runtime" ]] && SRC_URI="mirror://kde/unstable/kdepim/${PV}/${_kmname_pv}.tar.bz2" ;; - 4.4.[6789] | 4.4.1?*) - # Stable kdepim releases - SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2" - ;; *) # Stable KDE SC releases SRC_URI="mirror://kde/stable/${PV}/src/${_kmname_pv}.tar.bz2" + # KDEPIM IS SPECIAL + [[ ${KMNAME} == "kdepim" || ${KMNAME} == "kdepim-runtime" ]] && SRC_URI="mirror://kde/stable/kdepim-${PV}/src/${_kmname_pv}.tar.bz2" ;; esac ;; diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass index 036e1b543544..3370126ef930 100644 --- a/eclass/kde4-meta-pkg.eclass +++ b/eclass/kde4-meta-pkg.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.4 2011/06/07 20:11:04 abcd Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.5 2011/06/09 21:05:45 tampakrap Exp $ # @ECLASS: kde4-meta-pkg.eclass # @MAINTAINER: @@ -9,7 +9,7 @@ # @DESCRIPTION: # This eclass should only be used for defining meta packages for KDE4. -inherit kde4-functions versionator +inherit kde4-functions HOMEPAGE="http://www.kde.org/" @@ -18,7 +18,7 @@ IUSE="aqua" # Only add the kdeprefix USE flag for older versions, to help # non-portage package managers handle the upgrade -if [[ ${PV} < 4.6.4 ]]; then +if [[ ${PV} < 4.6.4 && ( ${PN} != kdepim-meta || ${PV} < 4.6 ) ]]; then IUSE+=" kdeprefix" fi |