diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/kde4-base.eclass | 2 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 6 | ||||
| -rw-r--r-- | eclass/kde4-meta-pkg.eclass | 3 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 998f2b2d564..c56404c4c6a 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: $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-base.eclass,v 1.87 2011/04/06 14:22:14 scarabeus Exp $ # @ECLASS: kde4-base.eclass # @MAINTAINER: diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 1765a2a1cd2..f2297750f14 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.41 2010/12/29 17:56:34 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-functions.eclass,v 1.45 2011/04/06 14:22:14 scarabeus Exp $ inherit versionator @@ -401,7 +401,7 @@ add_kdebase_dep() { elif [[ ${KDEBASE} != kde-base ]]; then ver=${KDE_MINIMAL} # FIXME remove hack when kdepim-4.4.* is gone - elif [[ ( ${KMNAME} == kdepim || ${PN} == kdepim-runtime ) && ${PV} == 4.4.[6-8] && ${1} =~ ^kde(pim)?libs$ ]]; then + elif [[ ( ${KMNAME} == kdepim || ${PN} == kdepim-runtime ) && ${SLOT} == 4.4 && ${1} =~ ^(kde(pim)?libs|oxygen-icons)$ ]]; then ver=4.4.5 # FIXME remove hack when kdepim-4.6beta is gone elif [[ ( ${KMNAME} == kdepim || ${PN} == kdepim-runtime ) && ${PV} == 4.5.98 && ${1} =~ ^(kde(pim)?libs|oxygen-icons)$ ]]; then diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass index 70b480541cc..529de176ee0 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: $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta-pkg.eclass,v 1.1 2011/04/06 14:22:14 scarabeus Exp $ # @ECLASS: kde4-meta-pkg.eclass # @MAINTAINER: @@ -19,4 +19,5 @@ RDEPEND="$(block_other_slots)" SLOT=$(_calculate_kde_slot) [[ -z ${SLOT} ]] && die "Unsupported ${PV}" +# portage dies out if last statement is like above so we need to pass true : diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 24c89215f75..76b6bbe94e0 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.47 2010/12/29 17:56:34 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.51 2011/04/06 14:22:14 scarabeus Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: |