commit: 4a7495631b6bf30ba8fcd214e508b9f47efdf4ab
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 18:43:22 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 18:45:46 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a749563
*/*: Switch my own packages to cmake.eclass
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-libs/libical/libical-3.0.5.ebuild | 16 ++++++++--------
dev-libs/libical/libical-3.0.6.ebuild | 16 ++++++++--------
dev-libs/libical/libical-3.0.7.ebuild | 16 ++++++++--------
dev-util/heaptrack/heaptrack-9999.ebuild | 6 +++---
media-libs/openicc/openicc-0.1.0.ebuild | 3 ++-
media-sound/yarock/yarock-1.4.0.ebuild | 4 ++--
6 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/dev-libs/libical/libical-3.0.5.ebuild
b/dev-libs/libical/libical-3.0.5.ebuild
index 8db90e5024f..3396a02d8f8 100644
--- a/dev-libs/libical/libical-3.0.5.ebuild
+++ b/dev-libs/libical/libical-3.0.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{5,6,7} )
-inherit cmake-utils python-any-r1
+inherit cmake python-any-r1
DESCRIPTION="An implementation of basic iCAL protocols"
HOMEPAGE="https://github.com/libical/libical";
@@ -52,7 +52,7 @@ pkg_setup() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
use examples || cmake_comment_add_subdirectory examples
}
@@ -61,18 +61,18 @@ src_configure() {
-DICAL_GLIB=$(usex glib)
-DICAL_GLIB_VAPI=OFF
-DGOBJECT_INTROSPECTION=OFF
- $(cmake-utils_use_find_package berkdb BDB)
+ $(cmake_use_find_package berkdb BDB)
-DICAL_BUILD_DOCS=$(usex doc)
-DSHARED_ONLY=$(usex !static-libs)
)
# TODO: disabled until useful
# -DGOBJECT_INTROSPECTION=$(usex introspection)
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_compile docs
+ cmake_src_compile
+ use doc && cmake_src_compile docs
}
src_test() {
@@ -80,13 +80,13 @@ src_test() {
-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
)
- cmake-utils_src_test
+ cmake_src_test
}
src_install() {
use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
- cmake-utils_src_install
+ cmake_src_install
if use examples; then
rm examples/CMakeLists.txt || die
diff --git a/dev-libs/libical/libical-3.0.6.ebuild
b/dev-libs/libical/libical-3.0.6.ebuild
index 7d8dbfd7e5f..4026fa7a713 100644
--- a/dev-libs/libical/libical-3.0.6.ebuild
+++ b/dev-libs/libical/libical-3.0.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{5,6,7} )
VALA_USE_DEPEND="vapigen"
-inherit cmake-utils python-any-r1 vala
+inherit cmake python-any-r1 vala
DESCRIPTION="An implementation of basic iCAL protocols"
HOMEPAGE="https://github.com/libical/libical";
@@ -53,14 +53,14 @@ pkg_setup() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
use examples || cmake_comment_add_subdirectory examples
use vala && vala_src_prepare
}
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_find_package berkdb BDB)
+ $(cmake_use_find_package berkdb BDB)
-DICAL_BUILD_DOCS=$(usex doc)
-DICAL_GLIB=$(usex introspection)
-DGOBJECT_INTROSPECTION=$(usex introspection)
@@ -74,12 +74,12 @@ src_configure() {
-DVAPIGEN="${VAPIGEN}"
)
fi
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_compile docs
+ cmake_src_compile
+ use doc && cmake_src_compile docs
}
src_test() {
@@ -87,13 +87,13 @@ src_test() {
-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
)
- cmake-utils_src_test
+ cmake_src_test
}
src_install() {
use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
- cmake-utils_src_install
+ cmake_src_install
if use examples; then
rm examples/CMakeLists.txt || die
diff --git a/dev-libs/libical/libical-3.0.7.ebuild
b/dev-libs/libical/libical-3.0.7.ebuild
index 6a708436675..9706f1bd65a 100644
--- a/dev-libs/libical/libical-3.0.7.ebuild
+++ b/dev-libs/libical/libical-3.0.7.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
VALA_USE_DEPEND="vapigen"
-inherit cmake-utils python-any-r1 vala
+inherit cmake python-any-r1 vala
DESCRIPTION="An implementation of basic iCAL protocols"
HOMEPAGE="https://github.com/libical/libical";
@@ -53,14 +53,14 @@ pkg_setup() {
}
src_prepare() {
- cmake-utils_src_prepare
+ cmake_src_prepare
use examples || cmake_comment_add_subdirectory examples
use vala && vala_src_prepare
}
src_configure() {
local mycmakeargs=(
- $(cmake-utils_use_find_package berkdb BDB)
+ $(cmake_use_find_package berkdb BDB)
-DICAL_BUILD_DOCS=$(usex doc)
-DICAL_GLIB=$(usex introspection)
-DGOBJECT_INTROSPECTION=$(usex introspection)
@@ -74,12 +74,12 @@ src_configure() {
-DVAPIGEN="${VAPIGEN}"
)
fi
- cmake-utils_src_configure
+ cmake_src_configure
}
src_compile() {
- cmake-utils_src_compile
- use doc && cmake-utils_src_compile docs
+ cmake_src_compile
+ use doc && cmake_src_compile docs
}
src_test() {
@@ -87,13 +87,13 @@ src_test() {
-E "(icalrecurtest|icalrecurtest-r)" # bug 660282
)
- cmake-utils_src_test
+ cmake_src_test
}
src_install() {
use doc && HTML_DOCS=( "${BUILD_DIR}"/apidocs/html/. )
- cmake-utils_src_install
+ cmake_src_install
if use examples; then
rm examples/CMakeLists.txt || die
diff --git a/dev-util/heaptrack/heaptrack-9999.ebuild
b/dev-util/heaptrack/heaptrack-9999.ebuild
index 99a1d52e0ce..b9572355eb6 100644
--- a/dev-util/heaptrack/heaptrack-9999.ebuild
+++ b/dev-util/heaptrack/heaptrack-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake-utils kde.org xdg-utils
+inherit cmake kde.org xdg-utils
DESCRIPTION="Fast heap memory profiler"
HOMEPAGE="http://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux";
@@ -46,9 +46,9 @@ src_configure() {
local mycmakeargs=(
-DHEAPTRACK_BUILD_GUI=$(usex gui)
-DBUILD_TESTING=$(usex test)
- $(cmake-utils_use_find_package zstd Zstd)
+ $(cmake_use_find_package zstd Zstd)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
xdg_pkg_postinst() {
diff --git a/media-libs/openicc/openicc-0.1.0.ebuild
b/media-libs/openicc/openicc-0.1.0.ebuild
index a3bda95e3ab..e6f43adc307 100644
--- a/media-libs/openicc/openicc-0.1.0.ebuild
+++ b/media-libs/openicc/openicc-0.1.0.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+CMAKE_ECLASS=cmake
inherit cmake-multilib
DESCRIPTION="Config database to store, share and manipulate colour management
informations"
@@ -43,5 +44,5 @@ multilib_src_configure() {
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc
OFF ON)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
diff --git a/media-sound/yarock/yarock-1.4.0.ebuild
b/media-sound/yarock/yarock-1.4.0.ebuild
index 7d9acc2b0a0..27284bd8598 100644
--- a/media-sound/yarock/yarock-1.4.0.ebuild
+++ b/media-sound/yarock/yarock-1.4.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit cmake-utils
+inherit cmake
MY_P="Yarock_${PV}_Sources"
DESCRIPTION="Qt-based music player"
@@ -49,5 +49,5 @@ src_configure() {
-DENABLE_VLC=$(usex vlc)
)
- cmake-utils_src_configure
+ cmake_src_configure
}
