commit: 9b08a69cc380a1a11ae077e1b909dbf7f4779192
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 14:48:48 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 16 09:23:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b08a69c
kde5-functions.eclass: Drop EAPI-6 support
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/kde5-functions.eclass | 48 +-------------------------------------------
1 file changed, 1 insertion(+), 47 deletions(-)
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index 377f741cb28..1e3685d6739 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -4,7 +4,7 @@
# @ECLASS: kde5-functions.eclass
# @MAINTAINER:
# k...@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
@@ -252,10 +251,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 +259,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:
