| 1 |
commit: e0238ccd9b535aab8ab222c8a68b34773a9299fd |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 14 14:48:48 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 16 14:51:47 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e0238ccd |
| 7 |
|
| 8 |
kde5-functions.eclass: Drop EAPI-6 support |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/kde5-functions.eclass | 48 +------------------------------------------- |
| 13 |
1 file changed, 1 insertion(+), 47 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass |
| 16 |
index 56aafd7eb6..e495fb8059 100644 |
| 17 |
--- a/eclass/kde5-functions.eclass |
| 18 |
+++ b/eclass/kde5-functions.eclass |
| 19 |
@@ -4,7 +4,7 @@ |
| 20 |
# @ECLASS: kde5-functions.eclass |
| 21 |
# @MAINTAINER: |
| 22 |
# kde@g.o |
| 23 |
-# @SUPPORTED_EAPIS: 6 7 |
| 24 |
+# @SUPPORTED_EAPIS: 7 |
| 25 |
# @BLURB: Common ebuild functions for packages based on KDE Frameworks 5. |
| 26 |
# @DESCRIPTION: |
| 27 |
# This eclass contains functions shared by the other KDE eclasses and forms |
| 28 |
@@ -19,7 +19,6 @@ inherit toolchain-funcs |
| 29 |
|
| 30 |
case ${EAPI} in |
| 31 |
7) ;; |
| 32 |
- 6) inherit eapi7-ver ;; |
| 33 |
*) die "EAPI=${EAPI:-0} is not supported" ;; |
| 34 |
esac |
| 35 |
|
| 36 |
@@ -249,10 +248,6 @@ add_qt_dep() { |
| 37 |
|
| 38 |
if [[ -z ${version} ]]; then |
| 39 |
version=${QT_MINIMAL} |
| 40 |
- if [[ ${1} = qtwebkit ]]; then |
| 41 |
- version=5.9.1 |
| 42 |
- [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is disallowed for 'qtwebkit' in EAPI 7 and later" |
| 43 |
- fi |
| 44 |
fi |
| 45 |
if [[ -z ${slot} ]]; then |
| 46 |
slot="5" |
| 47 |
@@ -261,47 +256,6 @@ add_qt_dep() { |
| 48 |
_add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}" |
| 49 |
} |
| 50 |
|
| 51 |
-# @FUNCTION: get_kde_version [version] |
| 52 |
-# @DESCRIPTION: |
| 53 |
-# Translates an ebuild version into a major.minor KDE release version, taking |
| 54 |
-# into account KDE's prerelease versioning scheme. |
| 55 |
-# For example, get_kde_version 17.07.80 will return "17.08". |
| 56 |
-# If the version equals 9999, "live" is returned. |
| 57 |
-# If no version is specified, ${PV} is used. |
| 58 |
-get_kde_version() { |
| 59 |
- [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later" |
| 60 |
- local ver=${1:-${PV}} |
| 61 |
- local major=$(ver_cut 1 ${ver}) |
| 62 |
- local minor=$(ver_cut 2 ${ver}) |
| 63 |
- local micro=$(ver_cut 3 ${ver}) |
| 64 |
- if [[ ${ver} == 9999 ]]; then |
| 65 |
- echo live |
| 66 |
- else |
| 67 |
- (( micro < 50 )) && echo ${major}.${minor} || echo ${major}.$((minor + 1)) |
| 68 |
- fi |
| 69 |
-} |
| 70 |
- |
| 71 |
-# @FUNCTION: kde_l10n2lingua |
| 72 |
-# @USAGE: <l10n>... |
| 73 |
-# @INTERNAL |
| 74 |
-# @DESCRIPTION: |
| 75 |
-# Output KDE lingua flag name(s) (without prefix(es)) appropriate for |
| 76 |
-# given l10n(s). |
| 77 |
-kde_l10n2lingua() { |
| 78 |
- [[ ${EAPI} != 6 ]] && die "${FUNCNAME} is banned in EAPI 7 and later" |
| 79 |
- local l |
| 80 |
- for l; do |
| 81 |
- case ${l} in |
| 82 |
- ca-valencia) echo ca@valencia;; |
| 83 |
- sr-ijekavsk) echo sr@ijekavian;; |
| 84 |
- sr-Latn-ijekavsk) echo sr@ijekavianlatin;; |
| 85 |
- sr-Latn) echo sr@latin;; |
| 86 |
- uz-Cyrl) echo uz@cyrillic;; |
| 87 |
- *) echo "${l/-/_}";; |
| 88 |
- esac |
| 89 |
- done |
| 90 |
-} |
| 91 |
- |
| 92 |
# @FUNCTION: punt_bogus_dep |
| 93 |
# @USAGE: <prefix> <dependency> |
| 94 |
# @DESCRIPTION: |
Archives