1 |
Functions moved to ecm-utils: |
2 |
- _check_gcc_version |
3 |
- punt_bogus_dep |
4 |
|
5 |
Variable moved to ecm-utils: |
6 |
- KDE_GCC_MINIMAL |
7 |
|
8 |
Deprecated: |
9 |
- _add_category_dep() |
10 |
- add_frameworks_dep() |
11 |
- add_plasma_dep() |
12 |
- add_kdeapps_dep() |
13 |
- add_qt_dep() |
14 |
|
15 |
|
16 |
--- a/eclass/kde5-functions.eclass |
17 |
+++ b/eclass/kde5-functions.eclass |
18 |
@@ -15,23 +15,11 @@ |
19 |
if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then |
20 |
_KDE5_FUNCTIONS_ECLASS=1 |
21 |
|
22 |
-inherit toolchain-funcs |
23 |
- |
24 |
case ${EAPI} in |
25 |
7) ;; |
26 |
*) die "EAPI=${EAPI:-0} is not supported" ;; |
27 |
esac |
28 |
|
29 |
-# @ECLASS-VARIABLE: KDE_BUILD_TYPE |
30 |
-# @DESCRIPTION: |
31 |
-# If PV matches "*9999*", this is automatically set to "live". |
32 |
-# Otherwise, this is automatically set to "release". |
33 |
-KDE_BUILD_TYPE="release" |
34 |
-if [[ ${PV} = *9999* ]]; then |
35 |
- KDE_BUILD_TYPE="live" |
36 |
-fi |
37 |
-export KDE_BUILD_TYPE |
38 |
- |
39 |
case ${CATEGORY} in |
40 |
kde-frameworks) |
41 |
[[ ${KDE_BUILD_TYPE} = live ]] && : ${FRAMEWORKS_MINIMAL:=9999} |
42 |
@@ -65,40 +53,6 @@ esac |
43 |
# Minimum version of KDE Applications to require. This affects add_kdeapps_dep. |
44 |
: ${KDE_APPS_MINIMAL:=19.04.3} |
45 |
|
46 |
-# @ECLASS-VARIABLE: KDE_GCC_MINIMAL |
47 |
-# @DEFAULT_UNSET |
48 |
-# @DESCRIPTION: |
49 |
-# Minimum version of active GCC to require. This is checked in kde5.eclass in |
50 |
-# kde5_pkg_pretend and kde5_pkg_setup. |
51 |
- |
52 |
-# @FUNCTION: _check_gcc_version |
53 |
-# @INTERNAL |
54 |
-# @DESCRIPTION: |
55 |
-# Determine if the current GCC version is acceptable, otherwise die. |
56 |
-_check_gcc_version() { |
57 |
- if [[ ${MERGE_TYPE} != binary && -v KDE_GCC_MINIMAL ]] && tc-is-gcc; then |
58 |
- |
59 |
- local version=$(gcc-version) |
60 |
- local major=${version%.*} |
61 |
- local minor=${version#*.} |
62 |
- local min_major=${KDE_GCC_MINIMAL%.*} |
63 |
- local min_minor=${KDE_GCC_MINIMAL#*.} |
64 |
- |
65 |
- debug-print "GCC version check activated" |
66 |
- debug-print "Version detected:" |
67 |
- debug-print " - Full: ${version}" |
68 |
- debug-print " - Major: ${major}" |
69 |
- debug-print " - Minor: ${minor}" |
70 |
- debug-print "Version required:" |
71 |
- debug-print " - Major: ${min_major}" |
72 |
- debug-print " - Minor: ${min_minor}" |
73 |
- |
74 |
- [[ ${major} -lt ${min_major} ]] || \ |
75 |
- ( [[ ${major} -eq ${min_major} && ${minor} -lt ${min_minor} ]] ) \ |
76 |
- && die "Sorry, but gcc-${KDE_GCC_MINIMAL} or later is required for this package (found ${version})." |
77 |
- fi |
78 |
-} |
79 |
- |
80 |
# @FUNCTION: _add_category_dep |
81 |
# @INTERNAL |
82 |
# @DESCRIPTION: |
83 |
@@ -143,6 +97,7 @@ _add_category_dep() { |
84 |
# The output of this should be added directly to DEPEND/RDEPEND, and may be |
85 |
# wrapped in a USE conditional (but not an || conditional without an extra set |
86 |
# of parentheses). |
87 |
+# PORTING: no replacement |
88 |
add_frameworks_dep() { |
89 |
debug-print-function ${FUNCNAME} "$@" |
90 |
|
91 |
@@ -175,6 +130,7 @@ add_frameworks_dep() { |
92 |
# The output of this should be added directly to DEPEND/RDEPEND, and may be |
93 |
# wrapped in a USE conditional (but not an || conditional without an extra set |
94 |
# of parentheses). |
95 |
+# PORTING: no replacement |
96 |
add_plasma_dep() { |
97 |
debug-print-function ${FUNCNAME} "$@" |
98 |
|
99 |
@@ -207,6 +163,7 @@ add_plasma_dep() { |
100 |
# The output of this should be added directly to DEPEND/RDEPEND, and may be |
101 |
# wrapped in a USE conditional (but not an || conditional without an extra set |
102 |
# of parentheses). |
103 |
+# PORTING: no replacement |
104 |
add_kdeapps_dep() { |
105 |
debug-print-function ${FUNCNAME} "$@" |
106 |
|
107 |
@@ -239,6 +196,7 @@ add_kdeapps_dep() { |
108 |
# The output of this should be added directly to DEPEND/RDEPEND, and may be |
109 |
# wrapped in a USE conditional (but not an || conditional without an extra set |
110 |
# of parentheses). |
111 |
+# PORTING: no replacement |
112 |
add_qt_dep() { |
113 |
debug-print-function ${FUNCNAME} "$@" |
114 |
|
115 |
@@ -263,6 +221,7 @@ add_qt_dep() { |
116 |
# @USAGE: <prefix> <dependency> |
117 |
# @DESCRIPTION: |
118 |
# Removes a specified dependency from a find_package call with multiple components. |
119 |
+# PORTING: Use ecm_punt_bogus_dep from ecm-utils.eclass instead. |
120 |
punt_bogus_dep() { |
121 |
local prefix=${1} |
122 |
local dep=${2} |