commit: 3befb8e2bbbd8be3ebb6045897dd73f2dbcfa1bc Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Sat Jan 31 23:24:44 2015 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Sat Jan 31 23:24:44 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3befb8e2
[eclass] Sort deps function a bit --- eclass/kde5-functions.eclass | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 75ee064..3e444fb 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