diff options
| -rw-r--r-- | eclass/kde4-base.eclass | 4 | ||||
| -rw-r--r-- | eclass/kde4-functions.eclass | 48 |
2 files changed, 24 insertions, 28 deletions
diff --git a/eclass/kde4-base.eclass b/eclass/kde4-base.eclass index db2cbdbd5a9..acf260b2539 100644 --- a/eclass/kde4-base.eclass +++ b/eclass/kde4-base.eclass @@ -28,7 +28,6 @@ inherit kde4-functions base virtualx eutils -get_build_type if [[ ${BUILD_TYPE} = live ]]; then case ${KDE_SCM} in svn) inherit subversion ;; @@ -479,8 +478,7 @@ _calculate_src_uri() { # Unstable KDE SC releases SRC_URI="mirror://kde/unstable/${PV}/src/${_kmname_pv}.tar.bz2" # KDEPIM IS SPECIAL - [[ ${KMNAME} == "kdepim" ]] && SRC_URI="mirror://kde/unstable/${KMNAME}/${PV}/src/${_kmname_pv}.tar.bz2" - [[ ${PN} == "kdepim-runtime" ]] && echo "yo"; SRC_URI="mirror://kde/unstable/${KMNAME}/${PV}/src/${P}.tar.bz2" + [[ ${KMNAME} == "kdepim" || ${PN} == "kdepim-runtime" ]] && SRC_URI="mirror://kde/unstable/${KMNAME}/${PV}/src/${_kmname_pv}.tar.bz2" ;; 4.4.[6789] | 4.4.1?) # Stable kdepim releases diff --git a/eclass/kde4-functions.eclass b/eclass/kde4-functions.eclass index 2af4cbfb22b..db698f0017f 100644 --- a/eclass/kde4-functions.eclass +++ b/eclass/kde4-functions.eclass @@ -65,6 +65,29 @@ KDE_SLOTS=( "4.1" "4.2" "4.3" "4.4" "4.5" "4.6" ) # The slots used by KDE live versions. Values should be ordered. KDE_LIVE_SLOTS=( "live" ) +# determine the build type +if [[ ${SLOT} = live || ${PV} = *9999* ]]; then + BUILD_TYPE="live" +else + BUILD_TYPE="release" +fi +export BUILD_TYPE + +# @ECLASS-VARIABLE: KDE_LINGUAS +# @DESCRIPTION: +# This is a whitespace-separated list of translations this ebuild supports. +# These translations are automatically added to IUSE. Therefore ebuilds must set +# this variable before inheriting any eclasses. To enable only selected +# translations, ebuilds must call enable_selected_linguas(). kde4-{base,meta}.eclass does +# this for you. +# +# Example: KDE_LINGUAS="en_GB de nl" +if [[ ${BUILD_TYPE} != live || -n ${KDE_LINGUAS_LIVE_OVERRIDE} ]]; then + for _lingua in ${KDE_LINGUAS}; do + IUSE="${IUSE} linguas_${_lingua}" + done +fi + # @FUNCTION: slot_is_at_least # @USAGE: <want> <have> # @DESCRIPTION: @@ -115,19 +138,6 @@ comment_all_add_subdirectory() { || die "${LINENO}: Initial sed died" } -# @ECLASS-VARIABLE: KDE_LINGUAS -# @DESCRIPTION: -# This is a whitespace-separated list of translations this ebuild supports. -# These translations are automatically added to IUSE. Therefore ebuilds must set -# this variable before inheriting any eclasses. To enable only selected -# translations, ebuilds must call enable_selected_linguas(). kde4-{base,meta}.eclass does -# this for you. -# -# Example: KDE_LINGUAS="en_GB de nl" -for _lingua in ${KDE_LINGUAS}; do - IUSE="${IUSE} linguas_${_lingua}" -done - # @FUNCTION: enable_selected_linguas # @DESCRIPTION: # Enable translations based on LINGUAS settings and translations supported by @@ -210,18 +220,6 @@ enable_selected_doc_linguas() { [[ -n "${linguas}" ]] && einfo "Enabling handbook translations:${linguas}" } -# @FUNCTION: get_build_type -# @DESCRIPTION: -# Determine whether we are using live ebuild or tbzs. -get_build_type() { - if [[ ${SLOT} = live || ${PV} = *9999* ]]; then - BUILD_TYPE="live" - else - BUILD_TYPE="release" - fi - export BUILD_TYPE -} - # @FUNCTION: migrate_store_dir # @DESCRIPTION: # Universal store dir migration |