diff options
| -rw-r--r-- | eclass/kde4-base.eclass | 13 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 12 | ||||
| -rw-r--r-- | eclass/kde4-meta-pkg.eclass | 21 |
3 files changed, 34 insertions, 12 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index 56388f1930c..0aa6c28f050 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -64,18 +64,7 @@ KDE_MINIMAL="${KDE_MINIMAL:-4.4}" # Set slot for KDEBASE known packages case ${KDEBASE} in kde-base) - major=$(get_major_version) - minor=$(get_version_component_range 2) - micro=$(get_version_component_range 3) - # Determine SLOT from PVs - [[ ${PV} == 9999* ]] && SLOT=live # regular live - [[ ${major} -eq 4 && ${micro} == 9999 ]] && SLOT=${major}.${minor} # stable live - if [[ ${major} -eq 4 && ${micro} != 9999 ]]; then - [[ ${micro} -lt 60 ]] && \ - SLOT=${major}.${minor} - [[ ${micro} -ge 60 ]] && - SLOT=${major}.$(($minor + 1)) - fi + SLOT=$(_calculate_kde_slot) [[ -z ${SLOT} ]] && die "Unsupported ${PV}" KDE_MINIMAL="${SLOT}" ;; diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index aaa939abc0b..1765a2a1cd2 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -596,3 +596,15 @@ _enable_selected_linguas_dir() { popd > /dev/null } + +_calculate_kde_slot() { + local ver=${1:-${PV}} + local major=$(get_major_version ${ver}) + local minor=$(get_version_component_range 2 ${ver}) + local micro=$(get_version_component_range 3 ${ver}) + [[ ${ver} == 9999 ]] && echo live + (( major == 4 && micro == 9999 )) && echo ${major}.${minor} + if (( major == 4 && micro != 9999 )); then + (( micro < 50 )) && echo ${major}.${minor} || echo ${major}.$((minor + 1)) + fi +} diff --git a/eclass/kde4-meta-pkg.eclass b/eclass/kde4-meta-pkg.eclass new file mode 100644 index 00000000000..ef88b2d0ac7 --- /dev/null +++ b/eclass/kde4-meta-pkg.eclass @@ -0,0 +1,21 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# @ECLASS: kde4-meta-pkg.eclass +# @MAINTAINER: +# kde@gentoo.org +# @BLURB: This eclass contains boilerplate for kde 4.X meta packages +# @DESCRIPTION: +# This eclass should only be used for defining meta packages for KDE4. + +inherit kde4-functions versionator + +HOMEPAGE="http://www.kde.org/" + +LICENSE="GPL-2" +IUSE="aqua kdeprefix" +RDEPEND="$(block_other_slots)" + +SLOT=$(_calculate_kde_slot) +[[ -z ${SLOT} ]] && die "Unsupported ${PV}" |