diff options
| -rw-r--r-- | eclass/kde5-functions.eclass | 26 |
1 files changed, 8 insertions, 18 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index b5f639eaf75..942c0251d53 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -136,22 +136,16 @@ _add_category_dep() { local category=${1} local package=${2} local use=${3} - local operator=${4} - local version=${5} - local slot=${6} + local version=${4} + local slot=${5} if [[ -n ${use} ]] ; then local use="[${use}]" fi if [[ -n ${version} ]] ; then - if [[ -z ${operator} ]] ; then - operator=">=" - fi - version="-$(get_version_component_range 1-3 ${version})" - if [[ ${operator} = "=" ]] ; then - version="${version}*" - fi + local operator=">=" + local version="-$(get_version_component_range 1-3 ${version})" fi if [[ -n ${slot} ]] ; then @@ -192,7 +186,7 @@ add_frameworks_dep() { version=${FRAMEWORKS_MINIMAL} fi - _add_category_dep kde-frameworks "${1}" "${2}" "" "${version}" "${4}" + _add_category_dep kde-frameworks "${1}" "${2}" "${version}" "${4}" } # @FUNCTION: add_plasma_dep @@ -214,21 +208,17 @@ add_plasma_dep() { die "${FUNCNAME} was called with too many arguments" fi - local operator local version if [[ -n ${3} ]]; then version=${3} elif [[ ${CATEGORY} = kde-plasma ]]; then version=${PV} - if [[ ${PV} = 5.8* ]] ; then - operator="=" - fi elif [[ -z "${version}" ]] ; then version=${PLASMA_MINIMAL} fi - _add_category_dep kde-plasma "${1}" "${2}" "${operator}" "${version}" "${4}" + _add_category_dep kde-plasma "${1}" "${2}" "${version}" "${4}" } # @FUNCTION: add_kdeapps_dep @@ -265,7 +255,7 @@ add_kdeapps_dep() { fi fi - _add_category_dep kde-apps "${1}" "${2}" "" "${version}" "${4}" + _add_category_dep kde-apps "${1}" "${2}" "${version}" "${4}" } # @FUNCTION: add_qt_dep @@ -300,7 +290,7 @@ add_qt_dep() { slot="5" fi - _add_category_dep dev-qt "${1}" "${2}" "" "${version}" "${slot}" + _add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}" } # @FUNCTION: get_kde_version |