diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-13 16:38:56 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-13 16:38:56 +0100 |
commit | ea31ad0ed5501d0bf92267c35beaf06ac016bad2 (patch) | |
tree | 2fdc433d571e3ead010876d43ce2646b7d783680 /eclass/kde5-functions.eclass | |
parent | 88ebe56470c37b02a044e1091cad6b2df0f3be8f (diff) |
gentoo resync : 13.05.2018
Diffstat (limited to 'eclass/kde5-functions.eclass')
-rw-r--r-- | eclass/kde5-functions.eclass | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index f9b00431bcc0..0fbff9846a6a 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -15,10 +15,10 @@ if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then _KDE5_FUNCTIONS_ECLASS=1 -inherit toolchain-funcs versionator +inherit toolchain-funcs case ${EAPI} in - 6) ;; + 6) inherit eapi7-ver ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac @@ -34,30 +34,29 @@ export KDE_BUILD_TYPE case ${CATEGORY} in kde-frameworks) - [[ ${PV} = 5.45* ]] && : ${QT_MINIMAL:=5.9.4} + [[ ${PV} = 5.43* ]] && : ${QT_MINIMAL:=5.7.1} [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} ;; kde-plasma) - [[ ${PV} = 5.12* ]] && : ${QT_MINIMAL:=5.9.1} - if [[ ${KDE_BUILD_TYPE} = live ]]; then - : ${QT_MINIMAL:=5.9.1} + [[ ${PV} = 5.11.5* ]] && : ${QT_MINIMAL:=5.7.1} + [[ ${PV} = 5.12.5* ]] && : ${QT_MINIMAL:=5.9.1} + if [[ ${KDE_BUILD_TYPE} = live && ${PV} != 5.12* ]]; then : ${FRAMEWORKS_MINIMAL:=9999} + : ${QT_MINIMAL:=5.10.1} fi ;; kde-apps) + [[ ${PV} = 17.12.3* ]] && : ${QT_MINIMAL:=5.9.1} if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 18.04* ]]; then : ${FRAMEWORKS_MINIMAL:=5.44.0} fi - if [[ ${KDE_BUILD_TYPE} = live || ${PV} = 17.12* ]]; then - : ${QT_MINIMAL:=5.9.1} - fi ;; esac # @ECLASS-VARIABLE: QT_MINIMAL # @DESCRIPTION: # Minimum version of Qt to require. This affects add_qt_dep. -: ${QT_MINIMAL:=5.7.1} +: ${QT_MINIMAL:=5.9.4} # @ECLASS-VARIABLE: FRAMEWORKS_MINIMAL # @DESCRIPTION: @@ -186,7 +185,7 @@ add_frameworks_dep() { if [[ -n ${3} ]]; then version=${3} elif [[ ${CATEGORY} = kde-frameworks ]]; then - version=$(get_version_component_range 1-2) + version=$(ver_cut 1-2) elif [[ -z ${3} ]] ; then version=${FRAMEWORKS_MINIMAL} fi @@ -218,7 +217,7 @@ add_plasma_dep() { if [[ -n ${3} ]]; then version=${3} elif [[ ${CATEGORY} = kde-plasma ]]; then - version=$(get_version_component_range 1-3) + version=$(ver_cut 1-3) elif [[ -z ${3} ]] ; then version=${PLASMA_MINIMAL} fi @@ -250,7 +249,7 @@ add_kdeapps_dep() { if [[ -n ${3} ]]; then version=${3} elif [[ ${CATEGORY} = kde-apps ]]; then - version=$(get_version_component_range 1-3) + version=$(ver_cut 1-3) elif [[ -z ${3} ]] ; then version=${KDE_APPS_MINIMAL} fi @@ -281,7 +280,7 @@ add_qt_dep() { local slot=${4} if [[ -z ${version} ]]; then - if [[ ${1} = qtwebkit && ${QT_MINIMAL} = 5.9* ]]; then + if [[ ${1} = qtwebkit && $(ver_cut 2 ${QT_MINIMAL}) -ge 9 ]]; then version=5.9.1 # no more upstream release, need bug #624404 else version=${QT_MINIMAL} @@ -303,9 +302,9 @@ add_qt_dep() { # If no version is specified, ${PV} is used. get_kde_version() { 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}) + local major=$(ver_cut 1 ${ver}) + local minor=$(ver_cut 2 ${ver}) + local micro=$(ver_cut 3 ${ver}) if [[ ${ver} == 9999 ]]; then echo live else |