| 1 |
commit: 4a7495631b6bf30ba8fcd214e508b9f47efdf4ab |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 30 18:43:22 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 30 18:45:46 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a749563 |
| 7 |
|
| 8 |
*/*: Switch my own packages to cmake.eclass |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-libs/libical/libical-3.0.5.ebuild | 16 ++++++++-------- |
| 13 |
dev-libs/libical/libical-3.0.6.ebuild | 16 ++++++++-------- |
| 14 |
dev-libs/libical/libical-3.0.7.ebuild | 16 ++++++++-------- |
| 15 |
dev-util/heaptrack/heaptrack-9999.ebuild | 6 +++--- |
| 16 |
media-libs/openicc/openicc-0.1.0.ebuild | 3 ++- |
| 17 |
media-sound/yarock/yarock-1.4.0.ebuild | 4 ++-- |
| 18 |
6 files changed, 31 insertions(+), 30 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-libs/libical/libical-3.0.5.ebuild b/dev-libs/libical/libical-3.0.5.ebuild |
| 21 |
index 8db90e5024f..3396a02d8f8 100644 |
| 22 |
--- a/dev-libs/libical/libical-3.0.5.ebuild |
| 23 |
+++ b/dev-libs/libical/libical-3.0.5.ebuild |
| 24 |
@@ -4,7 +4,7 @@ |
| 25 |
EAPI=7 |
| 26 |
|
| 27 |
PYTHON_COMPAT=( python3_{5,6,7} ) |
| 28 |
-inherit cmake-utils python-any-r1 |
| 29 |
+inherit cmake python-any-r1 |
| 30 |
|
| 31 |
DESCRIPTION="An implementation of basic iCAL protocols" |
| 32 |
HOMEPAGE="https://github.com/libical/libical" |
| 33 |
@@ -52,7 +52,7 @@ pkg_setup() { |
| 34 |
} |
| 35 |
|
| 36 |
src_prepare() { |
| 37 |
- cmake-utils_src_prepare |
| 38 |
+ cmake_src_prepare |
| 39 |
use examples || cmake_comment_add_subdirectory examples |
| 40 |
} |
| 41 |
|
| 42 |
@@ -61,18 +61,18 @@ src_configure() { |
| 43 |
-DICAL_GLIB=$(usex glib) |
| 44 |
-DICAL_GLIB_VAPI=OFF |
| 45 |
-DGOBJECT_INTROSPECTION=OFF |
| 46 |
- $(cmake-utils_use_find_package berkdb BDB) |
| 47 |
+ $(cmake_use_find_package berkdb BDB) |
| 48 |
-DICAL_BUILD_DOCS=$(usex doc) |
| 49 |
-DSHARED_ONLY=$(usex !static-libs) |
| 50 |
) |
| 51 |
# TODO: disabled until useful |
| 52 |
# -DGOBJECT_INTROSPECTION=$(usex introspection) |
| 53 |
- cmake-utils_src_configure |
| 54 |
+ cmake_src_configure |
| 55 |
} |
| 56 |
|
| 57 |
src_compile() { |
| 58 |
- cmake-utils_src_compile |
| 59 |
- use doc && cmake-utils_src_compile docs |
| 60 |
+ cmake_src_compile |
| 61 |
+ use doc && cmake_src_compile docs |
| 62 |
} |
| 63 |
|
| 64 |
src_test() { |
| 65 |
@@ -80,13 +80,13 @@ src_test() { |
| 66 |
-E "(icalrecurtest|icalrecurtest-r)" # bug 660282 |
| 67 |
) |
| 68 |
|
| 69 |
- cmake-utils_src_test |
| 70 |
+ cmake_src_test |
| 71 |
} |
| 72 |
|
| 73 |
src_install() { |
| 74 |
use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. ) |
| 75 |
|
| 76 |
- cmake-utils_src_install |
| 77 |
+ cmake_src_install |
| 78 |
|
| 79 |
if use examples; then |
| 80 |
rm examples/CMakeLists.txt || die |
| 81 |
|
| 82 |
diff --git a/dev-libs/libical/libical-3.0.6.ebuild b/dev-libs/libical/libical-3.0.6.ebuild |
| 83 |
index 7d8dbfd7e5f..4026fa7a713 100644 |
| 84 |
--- a/dev-libs/libical/libical-3.0.6.ebuild |
| 85 |
+++ b/dev-libs/libical/libical-3.0.6.ebuild |
| 86 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 87 |
|
| 88 |
PYTHON_COMPAT=( python3_{5,6,7} ) |
| 89 |
VALA_USE_DEPEND="vapigen" |
| 90 |
-inherit cmake-utils python-any-r1 vala |
| 91 |
+inherit cmake python-any-r1 vala |
| 92 |
|
| 93 |
DESCRIPTION="An implementation of basic iCAL protocols" |
| 94 |
HOMEPAGE="https://github.com/libical/libical" |
| 95 |
@@ -53,14 +53,14 @@ pkg_setup() { |
| 96 |
} |
| 97 |
|
| 98 |
src_prepare() { |
| 99 |
- cmake-utils_src_prepare |
| 100 |
+ cmake_src_prepare |
| 101 |
use examples || cmake_comment_add_subdirectory examples |
| 102 |
use vala && vala_src_prepare |
| 103 |
} |
| 104 |
|
| 105 |
src_configure() { |
| 106 |
local mycmakeargs=( |
| 107 |
- $(cmake-utils_use_find_package berkdb BDB) |
| 108 |
+ $(cmake_use_find_package berkdb BDB) |
| 109 |
-DICAL_BUILD_DOCS=$(usex doc) |
| 110 |
-DICAL_GLIB=$(usex introspection) |
| 111 |
-DGOBJECT_INTROSPECTION=$(usex introspection) |
| 112 |
@@ -74,12 +74,12 @@ src_configure() { |
| 113 |
-DVAPIGEN="${VAPIGEN}" |
| 114 |
) |
| 115 |
fi |
| 116 |
- cmake-utils_src_configure |
| 117 |
+ cmake_src_configure |
| 118 |
} |
| 119 |
|
| 120 |
src_compile() { |
| 121 |
- cmake-utils_src_compile |
| 122 |
- use doc && cmake-utils_src_compile docs |
| 123 |
+ cmake_src_compile |
| 124 |
+ use doc && cmake_src_compile docs |
| 125 |
} |
| 126 |
|
| 127 |
src_test() { |
| 128 |
@@ -87,13 +87,13 @@ src_test() { |
| 129 |
-E "(icalrecurtest|icalrecurtest-r)" # bug 660282 |
| 130 |
) |
| 131 |
|
| 132 |
- cmake-utils_src_test |
| 133 |
+ cmake_src_test |
| 134 |
} |
| 135 |
|
| 136 |
src_install() { |
| 137 |
use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. ) |
| 138 |
|
| 139 |
- cmake-utils_src_install |
| 140 |
+ cmake_src_install |
| 141 |
|
| 142 |
if use examples; then |
| 143 |
rm examples/CMakeLists.txt || die |
| 144 |
|
| 145 |
diff --git a/dev-libs/libical/libical-3.0.7.ebuild b/dev-libs/libical/libical-3.0.7.ebuild |
| 146 |
index 6a708436675..9706f1bd65a 100644 |
| 147 |
--- a/dev-libs/libical/libical-3.0.7.ebuild |
| 148 |
+++ b/dev-libs/libical/libical-3.0.7.ebuild |
| 149 |
@@ -5,7 +5,7 @@ EAPI=7 |
| 150 |
|
| 151 |
PYTHON_COMPAT=( python3_{6,7,8} ) |
| 152 |
VALA_USE_DEPEND="vapigen" |
| 153 |
-inherit cmake-utils python-any-r1 vala |
| 154 |
+inherit cmake python-any-r1 vala |
| 155 |
|
| 156 |
DESCRIPTION="An implementation of basic iCAL protocols" |
| 157 |
HOMEPAGE="https://github.com/libical/libical" |
| 158 |
@@ -53,14 +53,14 @@ pkg_setup() { |
| 159 |
} |
| 160 |
|
| 161 |
src_prepare() { |
| 162 |
- cmake-utils_src_prepare |
| 163 |
+ cmake_src_prepare |
| 164 |
use examples || cmake_comment_add_subdirectory examples |
| 165 |
use vala && vala_src_prepare |
| 166 |
} |
| 167 |
|
| 168 |
src_configure() { |
| 169 |
local mycmakeargs=( |
| 170 |
- $(cmake-utils_use_find_package berkdb BDB) |
| 171 |
+ $(cmake_use_find_package berkdb BDB) |
| 172 |
-DICAL_BUILD_DOCS=$(usex doc) |
| 173 |
-DICAL_GLIB=$(usex introspection) |
| 174 |
-DGOBJECT_INTROSPECTION=$(usex introspection) |
| 175 |
@@ -74,12 +74,12 @@ src_configure() { |
| 176 |
-DVAPIGEN="${VAPIGEN}" |
| 177 |
) |
| 178 |
fi |
| 179 |
- cmake-utils_src_configure |
| 180 |
+ cmake_src_configure |
| 181 |
} |
| 182 |
|
| 183 |
src_compile() { |
| 184 |
- cmake-utils_src_compile |
| 185 |
- use doc && cmake-utils_src_compile docs |
| 186 |
+ cmake_src_compile |
| 187 |
+ use doc && cmake_src_compile docs |
| 188 |
} |
| 189 |
|
| 190 |
src_test() { |
| 191 |
@@ -87,13 +87,13 @@ src_test() { |
| 192 |
-E "(icalrecurtest|icalrecurtest-r)" # bug 660282 |
| 193 |
) |
| 194 |
|
| 195 |
- cmake-utils_src_test |
| 196 |
+ cmake_src_test |
| 197 |
} |
| 198 |
|
| 199 |
src_install() { |
| 200 |
use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. ) |
| 201 |
|
| 202 |
- cmake-utils_src_install |
| 203 |
+ cmake_src_install |
| 204 |
|
| 205 |
if use examples; then |
| 206 |
rm examples/CMakeLists.txt || die |
| 207 |
|
| 208 |
diff --git a/dev-util/heaptrack/heaptrack-9999.ebuild b/dev-util/heaptrack/heaptrack-9999.ebuild |
| 209 |
index 99a1d52e0ce..b9572355eb6 100644 |
| 210 |
--- a/dev-util/heaptrack/heaptrack-9999.ebuild |
| 211 |
+++ b/dev-util/heaptrack/heaptrack-9999.ebuild |
| 212 |
@@ -3,7 +3,7 @@ |
| 213 |
|
| 214 |
EAPI=7 |
| 215 |
|
| 216 |
-inherit cmake-utils kde.org xdg-utils |
| 217 |
+inherit cmake kde.org xdg-utils |
| 218 |
|
| 219 |
DESCRIPTION="Fast heap memory profiler" |
| 220 |
HOMEPAGE="http://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux" |
| 221 |
@@ -46,9 +46,9 @@ src_configure() { |
| 222 |
local mycmakeargs=( |
| 223 |
-DHEAPTRACK_BUILD_GUI=$(usex gui) |
| 224 |
-DBUILD_TESTING=$(usex test) |
| 225 |
- $(cmake-utils_use_find_package zstd Zstd) |
| 226 |
+ $(cmake_use_find_package zstd Zstd) |
| 227 |
) |
| 228 |
- cmake-utils_src_configure |
| 229 |
+ cmake_src_configure |
| 230 |
} |
| 231 |
|
| 232 |
xdg_pkg_postinst() { |
| 233 |
|
| 234 |
diff --git a/media-libs/openicc/openicc-0.1.0.ebuild b/media-libs/openicc/openicc-0.1.0.ebuild |
| 235 |
index a3bda95e3ab..e6f43adc307 100644 |
| 236 |
--- a/media-libs/openicc/openicc-0.1.0.ebuild |
| 237 |
+++ b/media-libs/openicc/openicc-0.1.0.ebuild |
| 238 |
@@ -3,6 +3,7 @@ |
| 239 |
|
| 240 |
EAPI=7 |
| 241 |
|
| 242 |
+CMAKE_ECLASS=cmake |
| 243 |
inherit cmake-multilib |
| 244 |
|
| 245 |
DESCRIPTION="Config database to store, share and manipulate colour management informations" |
| 246 |
@@ -43,5 +44,5 @@ multilib_src_configure() { |
| 247 |
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON) |
| 248 |
) |
| 249 |
|
| 250 |
- cmake-utils_src_configure |
| 251 |
+ cmake_src_configure |
| 252 |
} |
| 253 |
|
| 254 |
diff --git a/media-sound/yarock/yarock-1.4.0.ebuild b/media-sound/yarock/yarock-1.4.0.ebuild |
| 255 |
index 7d9acc2b0a0..27284bd8598 100644 |
| 256 |
--- a/media-sound/yarock/yarock-1.4.0.ebuild |
| 257 |
+++ b/media-sound/yarock/yarock-1.4.0.ebuild |
| 258 |
@@ -3,7 +3,7 @@ |
| 259 |
|
| 260 |
EAPI=7 |
| 261 |
|
| 262 |
-inherit cmake-utils |
| 263 |
+inherit cmake |
| 264 |
|
| 265 |
MY_P="Yarock_${PV}_Sources" |
| 266 |
DESCRIPTION="Qt-based music player" |
| 267 |
@@ -49,5 +49,5 @@ src_configure() { |
| 268 |
-DENABLE_VLC=$(usex vlc) |
| 269 |
) |
| 270 |
|
| 271 |
- cmake-utils_src_configure |
| 272 |
+ cmake_src_configure |
| 273 |
} |
Archives