diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
| commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
| tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /eclass/kde5-functions.eclass | |
| parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) | |
gentoo resync : 03.11.2019
Diffstat (limited to 'eclass/kde5-functions.eclass')
| -rw-r--r-- | eclass/kde5-functions.eclass | 53 |
1 files changed, 2 insertions, 51 deletions
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 377f741cb28f..652ed06b7be5 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -4,7 +4,7 @@ # @ECLASS: kde5-functions.eclass # @MAINTAINER: # kde@gentoo.org -# @SUPPORTED_EAPIS: 6 7 +# @SUPPORTED_EAPIS: 7 # @BLURB: Common ebuild functions for packages based on KDE Frameworks 5. # @DESCRIPTION: # This eclass contains functions shared by the other KDE eclasses and forms @@ -19,7 +19,6 @@ inherit toolchain-funcs case ${EAPI} in 7) ;; - 6) inherit eapi7-ver ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac @@ -38,10 +37,7 @@ case ${CATEGORY} in [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} ;; kde-plasma) - if [[ ${PV} = 5.15.5 ]]; then - : ${FRAMEWORKS_MINIMAL:=5.57.0} - : ${QT_MINIMAL:=5.11.1} - fi + [[ ${PV} = 5.17* ]] && : ${FRAMEWORKS_MINIMAL:=5.63.0} [[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} ;; esac @@ -252,10 +248,6 @@ add_qt_dep() { if [[ -z ${version} ]]; then version=${QT_MINIMAL} - if [[ ${1} = qtwebkit ]]; then - version=5.9.1 - [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is disallowed for 'qtwebkit' in EAPI 7 and later" - fi fi if [[ -z ${slot} ]]; then slot="5" @@ -264,47 +256,6 @@ add_qt_dep() { _add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}" } -# @FUNCTION: get_kde_version [version] -# @DESCRIPTION: -# Translates an ebuild version into a major.minor KDE release version, taking -# into account KDE's prerelease versioning scheme. -# For example, get_kde_version 17.07.80 will return "17.08". -# If the version equals 9999, "live" is returned. -# If no version is specified, ${PV} is used. -get_kde_version() { - [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later" - local ver=${1:-${PV}} - 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 - (( micro < 50 )) && echo ${major}.${minor} || echo ${major}.$((minor + 1)) - fi -} - -# @FUNCTION: kde_l10n2lingua -# @USAGE: <l10n>... -# @INTERNAL -# @DESCRIPTION: -# Output KDE lingua flag name(s) (without prefix(es)) appropriate for -# given l10n(s). -kde_l10n2lingua() { - [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later" - local l - for l; do - case ${l} in - ca-valencia) echo ca@valencia;; - sr-ijekavsk) echo sr@ijekavian;; - sr-Latn-ijekavsk) echo sr@ijekavianlatin;; - sr-Latn) echo sr@latin;; - uz-Cyrl) echo uz@cyrillic;; - *) echo "${l/-/_}";; - esac - done -} - # @FUNCTION: punt_bogus_dep # @USAGE: <prefix> <dependency> # @DESCRIPTION: |