diff options
| author | Johannes Huber <johu@gentoo.org> | 2015-02-01 00:24:44 +0100 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2015-02-01 00:24:44 +0100 |
| commit | 3befb8e2bbbd8be3ebb6045897dd73f2dbcfa1bc (patch) | |
| tree | 7b726b8f91e91c103d79d83720f3c178cdea8fc4 | |
| parent | 6c68003fda689d2240ea45df4614166655f6b8ae (diff) | |
| download | kde-3befb8e2bbbd8be3ebb6045897dd73f2dbcfa1bc.tar.gz kde-3befb8e2bbbd8be3ebb6045897dd73f2dbcfa1bc.tar.bz2 kde-3befb8e2bbbd8be3ebb6045897dd73f2dbcfa1bc.zip | |
[eclass] Sort deps function a bit
| -rw-r--r-- | eclass/kde5-functions.eclass | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 75ee0648d39..3e444fbdde4 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -141,56 +141,56 @@ add_frameworks_dep() { _add_kdecategory_dep kde-frameworks "${1}" "${2}" "${version}" } -# @FUNCTION: add_kdeapps_dep +# @FUNCTION: add_kdeplasma_dep # @USAGE: <package> [USE flags] [minimum version] # @DESCRIPTION: -# Create proper dependency for kde-apps/ dependencies. +# Create proper dependency for kde-base/ dependencies. # This takes 1 to 3 arguments. The first being the package name, the optional # second is additional USE flags to append, and the optional third is the # version to use instead of the automatic version (use sparingly). # The output of this should be added directly to DEPEND/RDEPEND, and may be # wrapped in a USE conditional (but not an || conditional without an extra set # of parentheses). -add_kdeapps_dep() { +add_kdeplasma_dep() { debug-print-function ${FUNCNAME} "$@" local version if [[ -n ${3} ]]; then version=${3} - elif [[ ${CATEGORY} = kde-apps ]]; then + elif [[ ${CATEGORY} = kde-plasma ]]; then version=${PV} elif [[ -z "${version}" ]] ; then - version=${KDE_APPS_MINIMAL} + version=${PLASMA_MINIMAL} fi - _add_kdecategory_dep kde-apps "${1}" "${2}" "${version}" + _add_kdecategory_dep kde-plasma "${1}" "${2}" "${version}" } -# @FUNCTION: add_kdeplasma_dep +# @FUNCTION: add_kdeapps_dep # @USAGE: <package> [USE flags] [minimum version] # @DESCRIPTION: -# Create proper dependency for kde-base/ dependencies. +# Create proper dependency for kde-apps/ dependencies. # This takes 1 to 3 arguments. The first being the package name, the optional # second is additional USE flags to append, and the optional third is the # version to use instead of the automatic version (use sparingly). # The output of this should be added directly to DEPEND/RDEPEND, and may be # wrapped in a USE conditional (but not an || conditional without an extra set # of parentheses). -add_kdeplasma_dep() { +add_kdeapps_dep() { debug-print-function ${FUNCNAME} "$@" local version if [[ -n ${3} ]]; then version=${3} - elif [[ ${CATEGORY} = kde-plasma ]]; then + elif [[ ${CATEGORY} = kde-apps ]]; then version=${PV} elif [[ -z "${version}" ]] ; then - version=${PLASMA_MINIMAL} + version=${KDE_APPS_MINIMAL} fi - _add_kdecategory_dep kde-plasma "${1}" "${2}" "${version}" + _add_kdecategory_dep kde-apps "${1}" "${2}" "${version}" } # @FUNCTION: get_kde_version |
