| 1 |
commit: 6942ea8e144874e0db508cf3ef18678ef6c94916 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 21 11:07:23 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 29 13:03:41 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6942ea8e |
| 7 |
|
| 8 |
ecm.eclass: Switch to cmake.eclass |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/ecm.eclass | 28 ++++++++++++++-------------- |
| 13 |
1 file changed, 14 insertions(+), 14 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass |
| 16 |
index 40b4450c2d9..2892b0e0e94 100644 |
| 17 |
--- a/eclass/ecm.eclass |
| 18 |
+++ b/eclass/ecm.eclass |
| 19 |
@@ -13,7 +13,7 @@ |
| 20 |
# upstream release groups (Frameworks, Plasma, Applications) but also for any |
| 21 |
# other package that follows similar conventions. |
| 22 |
# |
| 23 |
-# This eclass unconditionally inherits cmake-utils.eclass and all its public |
| 24 |
+# This eclass unconditionally inherits cmake.eclass and all its public |
| 25 |
# variables and helper functions (not phase functions) may be considered as part |
| 26 |
# of this eclass's API. |
| 27 |
# |
| 28 |
@@ -49,7 +49,7 @@ if [[ ${CATEGORY} = kde-frameworks ]] ; then |
| 29 |
fi |
| 30 |
: ${ECM_NONGUI:=false} |
| 31 |
|
| 32 |
-inherit cmake-utils flag-o-matic toolchain-funcs virtualx |
| 33 |
+inherit cmake flag-o-matic toolchain-funcs virtualx |
| 34 |
|
| 35 |
if [[ ${ECM_NONGUI} = false ]] ; then |
| 36 |
inherit xdg |
| 37 |
@@ -74,7 +74,7 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test pkg_preinst pkg_po |
| 38 |
|
| 39 |
# @ECLASS-VARIABLE: ECM_DEBUG |
| 40 |
# @DESCRIPTION: |
| 41 |
-# Add "debug" to IUSE. If !debug, add -DNDEBUG (via cmake-utils_src_configure) |
| 42 |
+# Add "debug" to IUSE. If !debug, add -DNDEBUG (via cmake_src_configure) |
| 43 |
# and -DQT_NO_DEBUG to CPPFLAGS. If set to "false", do nothing. |
| 44 |
: ${ECM_DEBUG:=true} |
| 45 |
|
| 46 |
@@ -436,12 +436,12 @@ ecm_pkg_setup() { |
| 47 |
|
| 48 |
# @FUNCTION: ecm_src_prepare |
| 49 |
# @DESCRIPTION: |
| 50 |
-# Wrapper for cmake-utils_src_prepare with lots of extra logic for magic |
| 51 |
+# Wrapper for cmake_src_prepare with lots of extra logic for magic |
| 52 |
# handling of linguas, tests, handbook etc. |
| 53 |
ecm_src_prepare() { |
| 54 |
debug-print-function ${FUNCNAME} "$@" |
| 55 |
|
| 56 |
- cmake-utils_src_prepare |
| 57 |
+ cmake_src_prepare |
| 58 |
|
| 59 |
# only build examples when required |
| 60 |
if ! { in_iuse examples && use examples; } ; then |
| 61 |
@@ -517,12 +517,12 @@ ecm_src_prepare() { |
| 62 |
|
| 63 |
# @FUNCTION: ecm_src_configure |
| 64 |
# @DESCRIPTION: |
| 65 |
-# Wrapper for cmake-utils_src_configure with extra logic for magic handling of |
| 66 |
+# Wrapper for cmake_src_configure with extra logic for magic handling of |
| 67 |
# handbook, tests etc. |
| 68 |
ecm_src_configure() { |
| 69 |
debug-print-function ${FUNCNAME} "$@" |
| 70 |
|
| 71 |
- # we rely on cmake-utils.eclass to append -DNDEBUG too |
| 72 |
+ # we rely on cmake.eclass to append -DNDEBUG too |
| 73 |
if in_iuse debug && ! use debug; then |
| 74 |
append-cppflags -DQT_NO_DEBUG |
| 75 |
fi |
| 76 |
@@ -566,22 +566,22 @@ ecm_src_configure() { |
| 77 |
# allow the ebuild to override what we set here |
| 78 |
mycmakeargs=("${cmakeargs[@]}" "${mycmakeargs[@]}") |
| 79 |
|
| 80 |
- cmake-utils_src_configure |
| 81 |
+ cmake_src_configure |
| 82 |
} |
| 83 |
|
| 84 |
# @FUNCTION: ecm_src_compile |
| 85 |
# @DESCRIPTION: |
| 86 |
-# Wrapper for cmake-utils_src_compile. Currently doesn't do anything extra, but |
| 87 |
+# Wrapper for cmake_src_compile. Currently doesn't do anything extra, but |
| 88 |
# is included as part of the API just in case it's needed in the future. |
| 89 |
ecm_src_compile() { |
| 90 |
debug-print-function ${FUNCNAME} "$@" |
| 91 |
|
| 92 |
- cmake-utils_src_compile "$@" |
| 93 |
+ cmake_src_compile "$@" |
| 94 |
} |
| 95 |
|
| 96 |
# @FUNCTION: ecm_src_test |
| 97 |
# @DESCRIPTION: |
| 98 |
-# Wrapper for cmake-utils_src_test with extra logic for magic handling of dbus |
| 99 |
+# Wrapper for cmake_src_test with extra logic for magic handling of dbus |
| 100 |
# and virtualx. |
| 101 |
ecm_src_test() { |
| 102 |
debug-print-function ${FUNCNAME} "$@" |
| 103 |
@@ -591,7 +591,7 @@ ecm_src_test() { |
| 104 |
export $(dbus-launch) |
| 105 |
fi |
| 106 |
|
| 107 |
- cmake-utils_src_test |
| 108 |
+ cmake_src_test |
| 109 |
} |
| 110 |
|
| 111 |
# When run as normal user during ebuild development with the ebuild command, |
| 112 |
@@ -613,12 +613,12 @@ ecm_src_test() { |
| 113 |
|
| 114 |
# @FUNCTION: ecm_src_install |
| 115 |
# @DESCRIPTION: |
| 116 |
-# Wrapper for cmake-utils_src_install. Currently doesn't do anything extra, but |
| 117 |
+# Wrapper for cmake_src_install. Currently doesn't do anything extra, but |
| 118 |
# is included as part of the API just in case it's needed in the future. |
| 119 |
ecm_src_install() { |
| 120 |
debug-print-function ${FUNCNAME} "$@" |
| 121 |
|
| 122 |
- cmake-utils_src_install |
| 123 |
+ cmake_src_install |
| 124 |
} |
| 125 |
|
| 126 |
# @FUNCTION: ecm_pkg_preinst |
Archives