*/*: Switch kde proj packages to cmake.eclass
authorAndreas Sturmlechner <asturm@gentoo.org>
Sat, 21 Dec 2019 11:09:43 +0000 (12:09 +0100)
committerAndreas Sturmlechner <asturm@gentoo.org>
Sun, 29 Dec 2019 13:03:42 +0000 (14:03 +0100)
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
154 files changed:
app-crypt/qca/qca-2.2.1.ebuild
app-editors/okteta/okteta-0.26.2.ebuild
app-office/calligraplan/calligraplan-3.2.1.ebuild
app-office/calligraplan/calligraplan-3.2.2.ebuild
app-office/kexi/kexi-3.2.0-r1.ebuild
app-office/kmymoney/kmymoney-5.0.7.ebuild
app-office/libalkimia/libalkimia-7.0.2-r1.ebuild
app-office/skrooge/skrooge-2.20.0.ebuild
app-text/kbibtex/kbibtex-0.9.1.ebuild
app-text/poppler/poppler-0.82.0.ebuild
app-text/poppler/poppler-0.83.0.ebuild
app-text/poppler/poppler-0.84.0.ebuild
app-text/poppler/poppler-9999.ebuild
dev-cpp/rttr/rttr-0.9.6.ebuild
dev-db/kdb/kdb-3.2.0.ebuild
dev-games/freecell-solver/freecell-solver-5.14.0.ebuild
dev-libs/flatbuffers/flatbuffers-1.11.0.ebuild
dev-libs/grantlee/grantlee-5.2.0.ebuild
dev-libs/kreport/kreport-3.2.0.ebuild
dev-libs/libdbusmenu-qt/libdbusmenu-qt-0.9.3_pre20160218-r3.ebuild
dev-libs/libzip/libzip-1.5.2-r2.ebuild
dev-libs/sink/sink-0.8.0-r1.ebuild
dev-util/clazy/clazy-1.5-r1.ebuild
dev-util/clazy/clazy-1.5.ebuild
dev-util/cmake/cmake-3.13.5.ebuild
dev-util/cmake/cmake-3.14.6.ebuild
dev-util/cmake/cmake-3.16.2-r1.ebuild
dev-util/kdevelop/kdevelop-5.4.5.ebuild
dev-util/massif-visualizer/massif-visualizer-0.7.0-r1.ebuild
kde-apps/akonadi/akonadi-19.08.3.ebuild
kde-apps/analitza/analitza-19.08.3.ebuild
kde-apps/ark/ark-19.08.3.ebuild
kde-apps/audiocd-kio/audiocd-kio-19.08.3.ebuild
kde-apps/cantor/cantor-19.08.3.ebuild
kde-apps/dolphin/dolphin-19.08.3.ebuild
kde-apps/gwenview/gwenview-19.08.3.ebuild
kde-apps/k3b/k3b-19.08.3.ebuild
kde-apps/kalarm/kalarm-19.08.3.ebuild
kde-apps/kalgebra/kalgebra-19.08.3.ebuild
kde-apps/kalzium/kalzium-19.08.3.ebuild
kde-apps/kanagram/kanagram-19.08.3.ebuild
kde-apps/kate/kate-19.08.3.ebuild
kde-apps/kdenlive/kdenlive-19.08.3.ebuild
kde-apps/kdepim-addons/kdepim-addons-19.08.3.ebuild
kde-apps/kdialog/kdialog-19.08.3.ebuild
kde-apps/kget/kget-19.08.3.ebuild
kde-apps/kio-extras/kio-extras-19.08.3.ebuild
kde-apps/kipi-plugins/kipi-plugins-19.08.3.ebuild
kde-apps/kitinerary/kitinerary-19.08.3.ebuild
kde-apps/kmag/kmag-19.08.3.ebuild
kde-apps/kmix/kmix-19.08.3.ebuild
kde-apps/knotes/knotes-19.08.3.ebuild
kde-apps/kolourpaint/kolourpaint-19.08.3.ebuild
kde-apps/konqueror/konqueror-19.08.3.ebuild
kde-apps/konsole/konsole-19.08.3.ebuild
kde-apps/korganizer/korganizer-19.08.3.ebuild
kde-apps/krdc/krdc-19.08.3.ebuild
kde-apps/krfb/krfb-19.08.3.ebuild
kde-apps/kruler/kruler-19.08.3.ebuild
kde-apps/ksudoku/ksudoku-19.08.3.ebuild
kde-apps/ksystemlog/ksystemlog-19.08.3.ebuild
kde-apps/ktouch/ktouch-19.08.3.ebuild
kde-apps/ktp-common-internals/ktp-common-internals-19.08.3.ebuild
kde-apps/ktp-text-ui/ktp-text-ui-19.08.3.ebuild
kde-apps/libkcddb/libkcddb-19.08.3.ebuild
kde-apps/libkcompactdisc/libkcompactdisc-19.08.3.ebuild
kde-apps/libkleo/libkleo-19.08.3.ebuild
kde-apps/libksane/libksane-19.08.3.ebuild
kde-apps/marble/marble-19.08.3-r1.ebuild
kde-apps/marble/marble-19.12.0.ebuild
kde-apps/okular/okular-19.08.3.ebuild
kde-apps/spectacle/spectacle-19.08.3.ebuild
kde-apps/step/step-19.08.3.ebuild
kde-apps/thumbnailers/thumbnailers-19.08.3.ebuild
kde-apps/yakuake/yakuake-19.08.3.ebuild
kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.64.0.ebuild
kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.65.0.ebuild
kde-frameworks/breeze-icons/breeze-icons-5.64.0.ebuild
kde-frameworks/breeze-icons/breeze-icons-5.65.0.ebuild
kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.64.0.ebuild
kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.65.0.ebuild
kde-frameworks/frameworkintegration/frameworkintegration-5.64.0.ebuild
kde-frameworks/kapidox/kapidox-5.64.0.ebuild
kde-frameworks/kapidox/kapidox-5.65.0.ebuild
kde-frameworks/karchive/karchive-5.64.0.ebuild
kde-frameworks/kauth/kauth-5.64.0.ebuild
kde-frameworks/kconfigwidgets/kconfigwidgets-5.64.0.ebuild
kde-frameworks/kcoreaddons/kcoreaddons-5.64.0.ebuild
kde-frameworks/kdbusaddons/kdbusaddons-5.64.0.ebuild
kde-frameworks/kded/kded-5.64.0.ebuild
kde-frameworks/kdelibs4support/kdelibs4support-5.64.0.ebuild
kde-frameworks/kdesu/kdesu-5.64.0.ebuild
kde-frameworks/kdnssd/kdnssd-5.64.0.ebuild
kde-frameworks/kdoctools/kdoctools-5.64.0.ebuild
kde-frameworks/kfilemetadata/kfilemetadata-5.64.0.ebuild
kde-frameworks/khtml/khtml-5.64.0.ebuild
kde-frameworks/kidletime/kidletime-5.64.0.ebuild
kde-frameworks/kimageformats/kimageformats-5.64.0.ebuild
kde-frameworks/kinit/kinit-5.64.0.ebuild
kde-frameworks/kio/kio-5.64.0.ebuild
kde-frameworks/kjobwidgets/kjobwidgets-5.64.0.ebuild
kde-frameworks/knotifications/knotifications-5.64.0.ebuild
kde-frameworks/kpackage/kpackage-5.64.0.ebuild
kde-frameworks/kservice/kservice-5.64.0.ebuild
kde-frameworks/ktexteditor/ktexteditor-5.64.0.ebuild
kde-frameworks/ktextwidgets/ktextwidgets-5.64.0.ebuild
kde-frameworks/kwallet/kwallet-5.64.0.ebuild
kde-frameworks/kwindowsystem/kwindowsystem-5.64.0.ebuild
kde-frameworks/kxmlgui/kxmlgui-5.64.0.ebuild
kde-frameworks/oxygen-icons/oxygen-icons-5.64.0.ebuild
kde-frameworks/oxygen-icons/oxygen-icons-5.65.0.ebuild
kde-frameworks/plasma/plasma-5.64.0.ebuild
kde-frameworks/prison/prison-5.64.0.ebuild
kde-frameworks/sonnet/sonnet-5.64.0.ebuild
kde-misc/kdeconnect/kdeconnect-1.3.5.ebuild
kde-misc/kshutdown/kshutdown-5.1_beta.ebuild
kde-misc/tellico/tellico-3.2.3.ebuild
kde-plasma/breeze-plymouth/breeze-plymouth-5.17.4.ebuild
kde-plasma/kinfocenter/kinfocenter-5.17.4.ebuild
kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.4.ebuild
kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.4.ebuild
mail-client/kube/kube-0.7.0-r1.ebuild
mail-client/trojita/trojita-9999.ebuild
media-gfx/digikam/digikam-6.3.0-r1.ebuild
media-gfx/digikam/digikam-6.4.0.ebuild
media-gfx/kphotoalbum/kphotoalbum-5.5.ebuild
media-gfx/krita/krita-4.2.7.1.ebuild
media-gfx/krita/krita-4.2.8.2.ebuild
media-gfx/synnefo/synnefo-1.1.0.ebuild
media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild
media-libs/qimageblitz/qimageblitz-0.0.6_p20131029.ebuild
media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
media-libs/taglib-extras/taglib-extras-1.0.1-r1.ebuild
media-libs/zxing-cpp/zxing-cpp-1.0.7.ebuild
media-sound/cantata/cantata-2.3.3-r1.ebuild
media-sound/drumstick/drumstick-1.1.2.ebuild
media-sound/drumstick/drumstick-1.1.3.ebuild
media-sound/kid3/kid3-3.7.1.ebuild
media-sound/kid3/kid3-3.8.1.ebuild
media-sound/kmetronome/kmetronome-1.0.1.ebuild
media-video/plasma-mediacenter/plasma-mediacenter-5.7.5.ebuild
media-video/subtitlecomposer/subtitlecomposer-0.7.0.ebuild
net-im/choqok/choqok-1.6.0_p20190726.ebuild
net-irc/konversation/konversation-1.7.5-r1.ebuild
net-libs/jreen/jreen-1.3.0-r1.ebuild
net-libs/telepathy-qt/telepathy-qt-0.9.8.ebuild
net-p2p/ktorrent/ktorrent-5.1.1-r1.ebuild
sci-astronomy/kstars/kstars-3.2.3.ebuild
sci-astronomy/kstars/kstars-3.3.8-r2.ebuild
sci-libs/indilib/indilib-1.8.2-r1.ebuild
sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
www-client/falkon/falkon-3.1.0-r1.ebuild
x11-misc/sddm/sddm-0.18.1-r1.ebuild
x11-themes/qtcurve/qtcurve-9999.ebuild

index bacd8da8b96952546720e87f7d8f073ce0f7c803..d2bfa334dc7de533e982bd6a7aaeab02665ff4d3 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils qmake-utils
+inherit cmake qmake-utils
 
 DESCRIPTION="Qt Cryptographic Architecture (QCA)"
 HOMEPAGE="https://userbase.kde.org/QCA"
@@ -64,16 +64,16 @@ src_configure() {
                $(qca_plugin_use ssl ossl)
                -DBUILD_TESTS=$(usex test)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
        local -x QCA_PLUGIN_PATH="${BUILD_DIR}/lib/qca"
-       cmake-utils_src_test
+       cmake_src_test
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        if use doc; then
                pushd "${BUILD_DIR}" >/dev/null || die
index df4a8bac55ddc14f619b6acec79cbf4355880849..4e9dc984c24f073d76aa1992bc00ffb43a6b14c4 100644 (file)
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}"
 src_configure() {
        local mycmakeargs=(
                -DOMIT_EXAMPLES=ON
-               $(cmake-utils_use_find_package crypt Qca-qt5)
+               $(cmake_use_find_package crypt Qca-qt5)
                -DBUILD_DESIGNERPLUGIN=$(usex designer)
        )
 
index fa152b8659991b2c5979ade94f2ffb89f1db7b26..c610d97f9c28929062ad2a6b5d8638a03d5f2a60 100644 (file)
@@ -77,10 +77,10 @@ RESTRICT+=" test"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package activities KF5Activities)
-               $(cmake-utils_use_find_package holidays KF5Holidays)
-               $(cmake-utils_use_find_package kwallet Qca-qt5)
-               $(cmake-utils_use_find_package kwallet KF5Wallet)
+               $(cmake_use_find_package activities KF5Activities)
+               $(cmake_use_find_package holidays KF5Holidays)
+               $(cmake_use_find_package kwallet Qca-qt5)
+               $(cmake_use_find_package kwallet KF5Wallet)
        )
        # Qt5DBus can't be disabled because of KF5DBusAddons dependency
 
index 090d943589f88e8fb42a843fc997c9f9e8d46abc..45620a30fd04d03920324186fa90c86f81d98e02 100644 (file)
@@ -77,10 +77,10 @@ RESTRICT+=" test"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package activities KF5Activities)
-               $(cmake-utils_use_find_package holidays KF5Holidays)
-               $(cmake-utils_use_find_package kwallet Qca-qt5)
-               $(cmake-utils_use_find_package kwallet KF5Wallet)
+               $(cmake_use_find_package activities KF5Activities)
+               $(cmake_use_find_package holidays KF5Holidays)
+               $(cmake_use_find_package kwallet Qca-qt5)
+               $(cmake_use_find_package kwallet KF5Wallet)
        )
        # Qt5DBus can't be disabled because of KF5DBusAddons dependency
 
index fcd7857e501d0eb26b47c6863d55bce3f1f7bf4e..127b6156bd9e016f47fccf468651c4e5a600d913 100644 (file)
@@ -75,10 +75,10 @@ src_configure() {
                -DKEXI_MIGRATEMANAGER_DEBUG=$(usex debug)
                -DKEXI_AUTORISE_TABBED_TOOLBAR=$(usex experimental)
                -DKEXI_SCRIPTS_SUPPORT=$(usex experimental)
-               $(cmake-utils_use_find_package marble KexiMarble)
-               $(cmake-utils_use_find_package mdb GLIB2)
-               $(cmake-utils_use_find_package mysql MySQL)
-               $(cmake-utils_use_find_package postgres PostgreSQL)
+               $(cmake_use_find_package marble KexiMarble)
+               $(cmake_use_find_package mdb GLIB2)
+               $(cmake_use_find_package mysql MySQL)
+               $(cmake_use_find_package postgres PostgreSQL)
        )
        use experimental && mycmakeargs+=( -DKEXI_SCRIPTING_DEBUG=$(usex debug) )
 
index dcb9282ee91c76be04d80431d56254b6809d6872..75cc141e722ba26fcee73690087858c08d1a40a0 100644 (file)
@@ -102,17 +102,17 @@ pkg_setup() {
 src_configure() {
        local mycmakeargs=(
                -DUSE_QT_DESIGNER=OFF
-               $(cmake-utils_use_find_package activities KF5Activities)
-               $(cmake-utils_use_find_package addressbook KF5Akonadi)
-               $(cmake-utils_use_find_package addressbook KF5Contacts)
-               $(cmake-utils_use_find_package addressbook KF5IdentityManagement)
+               $(cmake_use_find_package activities KF5Activities)
+               $(cmake_use_find_package addressbook KF5Akonadi)
+               $(cmake_use_find_package addressbook KF5Contacts)
+               $(cmake_use_find_package addressbook KF5IdentityManagement)
                -DENABLE_LIBICAL=$(usex calendar)
                -DENABLE_KBANKING=$(usex hbci)
-               $(cmake-utils_use_find_package holidays KF5Holidays)
+               $(cmake_use_find_package holidays KF5Holidays)
                -DENABLE_OFXIMPORTER=$(usex ofx)
                -DENABLE_WEBENGINE=$(usex !webkit)
                -DENABLE_WEBOOB=$(usex weboob)
-               $(cmake-utils_use_find_package weboob PythonLibs)
+               $(cmake_use_find_package weboob PythonLibs)
        )
        ecm_src_configure
 }
index b0dbf45ff89cb698adef53a0624925bd15976a66..4a61fccbf5c517b2785d5e4a08a161794c2b6e4b 100644 (file)
@@ -31,8 +31,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package doc Doxygen)
-               $(cmake-utils_use_find_package !gmp MPIR)
+               $(cmake_use_find_package doc Doxygen)
+               $(cmake_use_find_package !gmp MPIR)
        )
        kde5_src_configure
 }
index 8ec5d4ff9162bb4616a53a4b76d2a768af3ed19a..7d87ce4cec461c7f05259b9e61105430fd347f86 100644 (file)
@@ -84,9 +84,9 @@ src_configure() {
        local mycmakeargs=(
                -DSKG_BUILD_TEST=$(usex test)
                -DSKG_DESIGNER=$(usex designer)
-               $(cmake-utils_use_find_package activities KF5Activities)
-               $(cmake-utils_use_find_package kde KF5Runner)
-               $(cmake-utils_use_find_package ofx LibOfx)
+               $(cmake_use_find_package activities KF5Activities)
+               $(cmake_use_find_package kde KF5Runner)
+               $(cmake_use_find_package ofx LibOfx)
                -DSKG_WEBENGINE=$(usex !webkit)
        )
 
index e01569d3b7fd419544844474e313290a4d0370fb..2f8ac5f786ca1e4d97ed897c6ea3f44d98edac3f 100644 (file)
@@ -68,7 +68,7 @@ src_configure() {
        local mycmakeargs=(
                -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
                $(cmake_use_find_package webengine Qt5WebEngineWidgets)
-               $(cmake-utils_use_find_package zotero Qca-qt5)
+               $(cmake_use_find_package zotero Qca-qt5)
        )
 
        ecm_src_configure
index 8386256fc10cc71b790aee4faaeba87d8f23ab12..1ad433185f4cb5baf353aade076bd044d23f4628 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
        inherit git-r3
@@ -65,7 +65,7 @@ PATCHES=(
 )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # Clang doesn't grok this flag, the configure nicely tests that, but
        # cmake just uses it, so remove it if we use clang
@@ -101,17 +101,17 @@ src_configure() {
                -DENABLE_CMS=$(usex lcms lcms2 none)
                -DWITH_NSS3=$(usex nss)
                -DWITH_PNG=$(usex png)
-               $(cmake-utils_use_find_package qt5 Qt5Core)
+               $(cmake_use_find_package qt5 Qt5Core)
                -DWITH_TIFF=$(usex tiff)
                -DENABLE_UTILS=$(usex utils)
        )
        use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # live version doesn't provide html documentation
        if use cairo && use doc && [[ ${PV} != *9999* ]]; then
index 33ffc42f9caca1d0201dc564d5213f87d2bbd441..4e79ad3d70dc45e5c524ee41c866b0403b0804a2 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
        inherit git-r3
@@ -65,7 +65,7 @@ PATCHES=(
 )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # Clang doesn't grok this flag, the configure nicely tests that, but
        # cmake just uses it, so remove it if we use clang
@@ -101,17 +101,17 @@ src_configure() {
                -DENABLE_CMS=$(usex lcms lcms2 none)
                -DWITH_NSS3=$(usex nss)
                -DWITH_PNG=$(usex png)
-               $(cmake-utils_use_find_package qt5 Qt5Core)
+               $(cmake_use_find_package qt5 Qt5Core)
                -DWITH_TIFF=$(usex tiff)
                -DENABLE_UTILS=$(usex utils)
        )
        use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # live version doesn't provide html documentation
        if use cairo && use doc && [[ ${PV} != *9999* ]]; then
index 12fe62839eb59a30733f8d242e5e4e4b66176d47..dc4ab8ebb00d2693cce47e722cec09d90e2cfc02 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
        inherit git-r3
@@ -65,7 +65,7 @@ PATCHES=(
 )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # Clang doesn't grok this flag, the configure nicely tests that, but
        # cmake just uses it, so remove it if we use clang
@@ -101,17 +101,17 @@ src_configure() {
                -DENABLE_CMS=$(usex lcms lcms2 none)
                -DWITH_NSS3=$(usex nss)
                -DWITH_PNG=$(usex png)
-               $(cmake-utils_use_find_package qt5 Qt5Core)
+               $(cmake_use_find_package qt5 Qt5Core)
                -DWITH_TIFF=$(usex tiff)
                -DENABLE_UTILS=$(usex utils)
        )
        use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # live version doesn't provide html documentation
        if use cairo && use doc && [[ ${PV} != *9999* ]]; then
index 12fe62839eb59a30733f8d242e5e4e4b66176d47..dc4ab8ebb00d2693cce47e722cec09d90e2cfc02 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils toolchain-funcs xdg-utils
+inherit cmake toolchain-funcs xdg-utils
 
 if [[ ${PV} == *9999* ]] ; then
        inherit git-r3
@@ -65,7 +65,7 @@ PATCHES=(
 )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # Clang doesn't grok this flag, the configure nicely tests that, but
        # cmake just uses it, so remove it if we use clang
@@ -101,17 +101,17 @@ src_configure() {
                -DENABLE_CMS=$(usex lcms lcms2 none)
                -DWITH_NSS3=$(usex nss)
                -DWITH_PNG=$(usex png)
-               $(cmake-utils_use_find_package qt5 Qt5Core)
+               $(cmake_use_find_package qt5 Qt5Core)
                -DWITH_TIFF=$(usex tiff)
                -DENABLE_UTILS=$(usex utils)
        )
        use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # live version doesn't provide html documentation
        if use cairo && use doc && [[ ${PV} != *9999* ]]; then
index 68f6af176d783a2593326f534f3138ace7250dc0..b85d69e5d1fab1c81fcafcf25d8b19be3f76652c 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Run Time Type Reflection - library adding reflection to C++"
 HOMEPAGE="https://www.rttr.org/"
@@ -28,7 +28,7 @@ src_configure() {
                -DBUILD_DOCUMENTATION=off #broken
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
index cc81d3aad20c1e0906423187c4eb9d2abf4a292f..ede80bfcaf1e57583f01e2cea35d8037b60fad86 100644 (file)
@@ -43,9 +43,9 @@ pkg_setup() {
 src_configure() {
        local mycmakeargs=(
                -DKDB_DEBUG_GUI=$(usex debug)
-               $(cmake-utils_use_find_package mysql MySQL)
-               $(cmake-utils_use_find_package postgres PostgreSQL)
-               $(cmake-utils_use_find_package sqlite Sqlite)
+               $(cmake_use_find_package mysql MySQL)
+               $(cmake_use_find_package postgres PostgreSQL)
+               $(cmake_use_find_package sqlite Sqlite)
        )
 
        kde5_src_configure
index b74bce4f433583c3861bc67b49a6f02065f37806..f3f63a5b41707b4356d9ad3cc118c692184491ea 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 DESCRIPTION="C library for automatically solving Freecell and some other solitaire variants"
 HOMEPAGE="https://fc-solve.shlomifish.org/"
@@ -37,7 +37,7 @@ src_prepare() {
 
        python_fix_shebang board_gen
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -48,5 +48,5 @@ src_configure() {
                -DFCS_AVOID_TCMALLOC=$(usex !tcmalloc)
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index aa501d3ba73ad2413a89b390f6e7d30073edeeb5..9f8719c337cb52f559842678d7219ad845f02413 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Memory efficient serialization library"
 HOMEPAGE="https://google.github.io/flatbuffers/"
@@ -26,5 +26,5 @@ src_configure() {
 
        use elibc_musl && mycmakeargs+=( -DFLATBUFFERS_LOCALE_INDEPENDENT=0 )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 9d5b5a2b95864eca5a6d03188589d1d51bdc4f7d..5f7dff2d6d27bffa3289f5e2dbc511b36851240a 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 VIRTUALX_REQUIRED="test"
-inherit cmake-utils virtualx
+inherit cmake virtualx
 
 DESCRIPTION="C++ string template engine based on the Django template system"
 HOMEPAGE="https://github.com/steveire/grantlee"
@@ -40,21 +40,21 @@ src_configure() {
                -DBUILD_TESTS=$(usex test)
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
 
-       use doc && cmake-utils_src_compile docs
+       use doc && cmake_src_compile docs
 }
 
 src_test() {
-       virtx cmake-utils_src_test
+       virtx cmake_src_test
 }
 
 src_install() {
        use doc && local HTML_DOCS=("${BUILD_DIR}/apidox/")
 
-       cmake-utils_src_install
+       cmake_src_install
 }
index 97555f856932b8c714028a1d7d565a277d90c77b..952f116009a0a36da72757f893d2d1c0628975db 100644 (file)
@@ -42,8 +42,8 @@ pkg_setup() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package marble Marble)
-               $(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+               $(cmake_use_find_package marble Marble)
+               $(cmake_use_find_package webkit Qt5WebKitWidgets)
                -DKREPORT_SCRIPTING=$(usex scripting)
        )
        kde5_src_configure
index 91e13fae705586b965d77272318a83d91f9a7381..ce7c70567284a5a423b9a57e5ab52e1d63fb7981 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 MY_PV=${PV/_pre/+16.04.}
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Library providing Qt implementation of DBusMenu specification"
 HOMEPAGE="https://launchpad.net/libdbusmenu-qt/"
@@ -28,7 +28,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        cmake_comment_add_subdirectory tools
        # tests fail due to missing connection to dbus
index f1c84d5ed7be7bf090d2046890a05ff25e36d9ef..bb7b5e5421b6dbc3874b0edabf48ab80444105d9 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils multibuild
+inherit cmake multibuild
 
 DESCRIPTION="Library for manipulating zip archives"
 HOMEPAGE="https://nih.at/libzip/"
@@ -90,20 +90,20 @@ src_configure() {
                                -DENABLE_OPENSSL=OFF
                        )
                fi
-               cmake-utils_src_configure
+               cmake_src_configure
        }
 
        multibuild_foreach_variant myconfigure
 }
 
 src_compile() {
-       multibuild_foreach_variant cmake-utils_src_compile
+       multibuild_foreach_variant cmake_src_compile
 }
 
 src_test() {
-       [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test
+       [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake_src_test
 }
 
 src_install() {
-       multibuild_foreach_variant cmake-utils_src_install
+       multibuild_foreach_variant cmake_src_install
 }
index b578e12e6682352d0d7538828169ded4bd60c8b0..439b04419d72bfabefc52bb49ccb3f110d12e3df 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Data access layer handling synchronization, caching and indexing"
 HOMEPAGE="https://kube-project.com"
@@ -50,5 +50,5 @@ src_configure() {
        local mycmakeargs=(
                -DCMAKE_DISABLE_FIND_PACKAGE_Libgit2=ON
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index f5cd867cd90953ebb6fac78f12f895b660a417d6..d3f38a652bb61daf124e1fe067f47ccfbf429209 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
 HOMEPAGE="https://cgit.kde.org/clazy.git/tree/README.md"
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
 DOCS=( README.md )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
                -i CMakeLists.txt || die
@@ -39,11 +39,11 @@ src_configure() {
        # bug #681568
        local clang_version=$(best_version sys-devel/clang)
        export LLVM_ROOT="/usr/lib/llvm/$(ver_cut 1 ${clang_version##sys-devel/clang-})"
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        mv "${D}"/usr/share/doc/clazy/* "${D}"/usr/share/doc/${PF} || die
        rmdir "${D}"/usr/share/doc/clazy || die
 }
index 7bf24b0ba071a07817a68f9d91257dc07e71c057..ba0428212c7a28691f302486588b246c2a385da4 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
 HOMEPAGE="https://cgit.kde.org/clazy.git/tree/README.md"
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
 DOCS=( README.md )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
                -i CMakeLists.txt || die
@@ -33,7 +33,7 @@ src_prepare() {
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        mv "${D}"/usr/share/doc/clazy/* "${D}"/usr/share/doc/${PF} || die
        rmdir "${D}"/usr/share/doc/clazy || die
 }
index 62c8b00e4ae600cea0568449c2631efad93c8c07..529cc0a350ef1562ebebca2334eb28a9520a93bf 100644 (file)
@@ -4,8 +4,8 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake
 
 MY_P="${P/_/-}"
 
@@ -135,7 +135,7 @@ cmake_src_test() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # disable Xcode hooks, bug #652134
        if [[ ${CHOST} == *-darwin* ]] ; then
@@ -174,15 +174,15 @@ src_configure() {
        if use qt5 ; then
                mycmakeargs+=(
                        -DBUILD_QtDialog=ON
-                       $(cmake-utils_use_find_package qt5 Qt5Widgets)
+                       $(cmake_use_find_package qt5 Qt5Widgets)
                )
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
        use emacs && elisp-compile Auxiliary/cmake-mode.el
 }
 
@@ -191,7 +191,7 @@ src_test() {
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        if use emacs; then
                elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
index 83e33d005103efe6081ebd5be9efbe9c5875d94a..ee04242b9117b3fdf8c11b826a8db9c454536065 100644 (file)
@@ -4,8 +4,8 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake
 
 MY_P="${P/_/-}"
 
@@ -134,7 +134,7 @@ cmake_src_test() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # disable Xcode hooks, bug #652134
        if [[ ${CHOST} == *-darwin* ]] ; then
@@ -174,15 +174,15 @@ src_configure() {
        if use qt5 ; then
                mycmakeargs+=(
                        -DBUILD_QtDialog=ON
-                       $(cmake-utils_use_find_package qt5 Qt5Widgets)
+                       $(cmake_use_find_package qt5 Qt5Widgets)
                )
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
        use emacs && elisp-compile Auxiliary/cmake-mode.el
 }
 
@@ -191,7 +191,7 @@ src_test() {
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        if use emacs; then
                elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
index e7600adaecc48b4714a1e56ee4a3f0025f09acd3..f2216b9a5c2d66b88ad412564f5c93a455951d62 100644 (file)
@@ -4,9 +4,9 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
+CMAKE_REMOVE_MODULES_LIST=( none )
 inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
-       toolchain-funcs virtualx xdg cmake-utils
+       toolchain-funcs virtualx xdg cmake
 
 MY_P="${P/_/-}"
 
@@ -125,7 +125,7 @@ cmake_src_test() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # disable Xcode hooks, bug #652134
        if [[ ${CHOST} == *-darwin* ]] ; then
@@ -164,15 +164,15 @@ src_configure() {
        if use qt5 ; then
                mycmakeargs+=(
                        -DBUILD_QtDialog=ON
-                       $(cmake-utils_use_find_package qt5 Qt5Widgets)
+                       $(cmake_use_find_package qt5 Qt5Widgets)
                )
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
        use emacs && elisp-compile Auxiliary/cmake-mode.el
 }
 
@@ -181,7 +181,7 @@ src_test() {
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        if use emacs; then
                elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
index 8467cba14272c0f0cb4c403bd534acfefa73f985..f4738aa67429c912fa477e8c3a2c42be61e08303 100644 (file)
@@ -103,14 +103,14 @@ RESTRICT+=" test"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package gdbui KF5SysGuard)
+               $(cmake_use_find_package gdbui KF5SysGuard)
                -DBUILD_executeplasmoid=$(usex plasma)
-               $(cmake-utils_use_find_package plasma KF5Plasma)
-               $(cmake-utils_use_find_package hex OktetaKastenControllers)
-               $(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-               $(cmake-utils_use_find_package reviewboard KF5Purpose)
-               $(cmake-utils_use_find_package subversion SubversionLibrary)
-               $(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
+               $(cmake_use_find_package plasma KF5Plasma)
+               $(cmake_use_find_package hex OktetaKastenControllers)
+               $(cmake_use_find_package qmake KDevelop-PG-Qt)
+               $(cmake_use_find_package reviewboard KF5Purpose)
+               $(cmake_use_find_package subversion SubversionLibrary)
+               $(cmake_use_find_package !webkit Qt5WebEngineWidgets)
        )
 
        use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
index bf0964314b2a67270140415d1e55dfc473fac262..adcfcea9c50da6aab3f8341516d873cdc33c38f3 100644 (file)
@@ -40,7 +40,7 @@ PATCHES=( "${FILESDIR}/${P}-fix-window-icon.patch" )
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package callgraph KGraphViewerPart)
+               $(cmake_use_find_package callgraph KGraphViewerPart)
        )
        kde5_src_configure
 }
index 0c1c41e1a9b567314e166ff5d8e300ff96ada011..6f92902e7f1654f2b934d17686e277882854970d 100644 (file)
@@ -98,7 +98,7 @@ src_configure() {
        local mycmakeargs=(
                -DAKONADI_BUILD_QSQLITE=$(usex sqlite)
                -DBUILD_TOOLS=$(usex tools)
-               $(cmake-utils_use_find_package xml LibXml2)
+               $(cmake_use_find_package xml LibXml2)
        )
 
        ecm_src_configure
index 0030c9a8bf754d700b53b9cbc41379930ec7b8a0..7df385e57cf5710164efc20e3dcf223ac5c80b05 100644 (file)
@@ -40,7 +40,7 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package eigen Eigen3)
+               $(cmake_use_find_package eigen Eigen3)
        )
 
        ecm_src_configure
index fa158209aa3e0c32c148efbb2c2ce716bf89d1d6..18ae6f375bf2b9bc4370c7df5cfb787b0824fd02 100644 (file)
@@ -55,9 +55,9 @@ RESTRICT+=" test"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package bzip2 BZip2)
-               $(cmake-utils_use_find_package lzma LibLZMA)
-               $(cmake-utils_use_find_package zip LibZip)
+               $(cmake_use_find_package bzip2 BZip2)
+               $(cmake_use_find_package lzma LibLZMA)
+               $(cmake_use_find_package zip LibZip)
        )
 
        ecm_src_configure
index 319f0bacb4c60ec61d29cbde3edacfa47023c6c7..82666c261330ff58e44135bce45b8ca231f581ff 100644 (file)
@@ -39,8 +39,8 @@ PATCHES=( "${FILESDIR}/${PN}-19.04.0-handbook.patch" )
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package flac FLAC)
-               $(cmake-utils_use_find_package vorbis OggVorbis)
+               $(cmake_use_find_package flac FLAC)
+               $(cmake_use_find_package vorbis OggVorbis)
        )
 
        ecm_src_configure
index e246fa0117a6185494c51b10f0ed32428a3fff5a..33ced1b63d6d04e2cfba57e06194312c4124e645 100644 (file)
@@ -96,14 +96,14 @@ src_configure() {
 
        local mycmakeargs=(
                -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
-               $(cmake-utils_use_find_package analitza Analitza5)
-               $(cmake-utils_use_find_package julia Julia)
-               $(cmake-utils_use_find_package lua LuaJIT)
-               $(cmake-utils_use_find_package markdown Discount)
-               $(cmake-utils_use_find_package postscript LibSpectre)
-               $(cmake-utils_use_find_package python PythonLibs3)
-               $(cmake-utils_use_find_package qalculate Qalculate)
-               $(cmake-utils_use_find_package R R)
+               $(cmake_use_find_package analitza Analitza5)
+               $(cmake_use_find_package julia Julia)
+               $(cmake_use_find_package lua LuaJIT)
+               $(cmake_use_find_package markdown Discount)
+               $(cmake_use_find_package postscript LibSpectre)
+               $(cmake_use_find_package python PythonLibs3)
+               $(cmake_use_find_package qalculate Qalculate)
+               $(cmake_use_find_package R R)
        )
        ecm_src_configure
 }
index f73a18c7931b84921965107ce8189a0a98f0ff6c..8a4b107a6fa66464755c22922f33712b355e281a 100644 (file)
@@ -64,10 +64,10 @@ RESTRICT+=" test"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package activities KF5Activities)
-               $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-               $(cmake-utils_use_find_package semantic-desktop KF5BalooWidgets)
-               $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+               $(cmake_use_find_package activities KF5Activities)
+               $(cmake_use_find_package semantic-desktop KF5Baloo)
+               $(cmake_use_find_package semantic-desktop KF5BalooWidgets)
+               $(cmake_use_find_package semantic-desktop KF5FileMetaData)
        )
 
        ecm_src_configure
index bf3290636902a0de7086b5fc32709cdb6815fbaf..c5b0e928a0b1dfa5cf7bccf38509b0527e694bd0 100644 (file)
@@ -86,12 +86,12 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package activities KF5Activities)
-               $(cmake-utils_use_find_package fits CFitsio)
-               $(cmake-utils_use_find_package kipi KF5Kipi)
-               $(cmake-utils_use_find_package raw KF5KDcraw)
-               $(cmake-utils_use_find_package share KF5Purpose)
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package activities KF5Activities)
+               $(cmake_use_find_package fits CFitsio)
+               $(cmake_use_find_package kipi KF5Kipi)
+               $(cmake_use_find_package raw KF5KDcraw)
+               $(cmake_use_find_package share KF5Purpose)
+               $(cmake_use_find_package X X11)
        )
 
        if use semantic-desktop; then
index 584b48bf6dc8dc1f6466d02582eff482eb2b0099..7f12742964b4c40c26062ccc7cdb39a3a79dc403 100644 (file)
@@ -103,7 +103,7 @@ src_configure() {
                -DK3B_ENABLE_TAGLIB=$(usex taglib)
                -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
                -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-               $(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+               $(cmake_use_find_package webkit Qt5WebKitWidgets)
        )
 
        ecm_src_configure
index b7c746cc5a5165f2e9f4bb077ff7e52d64434412..4cd97f1b701a1122ab37c3ca1075896028e9521e 100644 (file)
@@ -77,8 +77,8 @@ RDEPEND="${DEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package X Qt5X11Extras)
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package X Qt5X11Extras)
+               $(cmake_use_find_package X X11)
        )
 
        ecm_src_configure
index 3ee55b2ddf7e5312ad2615757e7047cbfda33238..24c67991adbbbebc34ec5d9899ebc14d6138c92f 100644 (file)
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package readline Readline)
+               $(cmake_use_find_package readline Readline)
        )
 
        ecm_src_configure
index 61202b251f36d12dbeaa6d986e8dd95c2a7377e1..d449184bd049513adcdb9f764035e4b40db39e94 100644 (file)
@@ -52,11 +52,11 @@ src_configure(){
        [[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
 
        local mycmakeargs=(
-               $(cmake-utils_use_find_package editor Eigen3)
-               $(cmake-utils_use_find_package editor AvogadroLibs)
-               $(cmake-utils_use_find_package editor OpenBabel2)
-               $(cmake-utils_use_find_package solver OCaml)
-               $(cmake-utils_use_find_package solver Libfacile)
+               $(cmake_use_find_package editor Eigen3)
+               $(cmake_use_find_package editor AvogadroLibs)
+               $(cmake_use_find_package editor OpenBabel2)
+               $(cmake_use_find_package solver OCaml)
+               $(cmake_use_find_package solver Libfacile)
        )
 
        ecm_src_configure
index 44774001c87f2fa9ebdce0eafb9ae77a71ac4f2b..feb5be3ba80488e4dc4b2b3513d254a333254fe4 100644 (file)
@@ -42,7 +42,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package speech Qt5TextToSpeech)
+               $(cmake_use_find_package speech Qt5TextToSpeech)
        )
 
        ecm_src_configure
index 50f033411a0a4901eaf3b11acbb2f638e775334c..b84ab5c954562bf0c924ed76a1b2d9669fac4d7c 100644 (file)
@@ -69,7 +69,7 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package activities KF5Activities)
+               $(cmake_use_find_package activities KF5Activities)
                -DBUILD_addons=$(usex addons)
                -DBUILD_kwrite=FALSE
        )
index e32cf708c943e920cfea77db0a33a343a0fd760d..1b49405064c9bcfe2a0ff5e86181b66874eff85c 100644 (file)
@@ -72,10 +72,10 @@ PATCHES=( "${FILESDIR}"/${P}-qt-5.14-{1,2}.patch )
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package freesound Qt5WebKitWidgets)
-               $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-               $(cmake-utils_use_find_package share KF5Purpose)
-               $(cmake-utils_use_find_package v4l LibV4L2)
+               $(cmake_use_find_package freesound Qt5WebKitWidgets)
+               $(cmake_use_find_package semantic-desktop KF5FileMetaData)
+               $(cmake_use_find_package share KF5Purpose)
+               $(cmake_use_find_package v4l LibV4L2)
        )
 
        ecm_src_configure
index 102e1ad40f501021b9165fc8549845827f87e7fc..ae559f328b457a7d19bdb448e1bf2e6959c750e8 100644 (file)
@@ -76,8 +76,8 @@ RESTRICT+=" test"
 src_configure() {
        local mycmakeargs=(
                -DKDEPIMADDONS_BUILD_EXAMPLES=$(usex examples)
-               $(cmake-utils_use_find_package importwizard KPimImportWizard)
-               $(cmake-utils_use_find_package markdown Discount)
+               $(cmake_use_find_package importwizard KPimImportWizard)
+               $(cmake_use_find_package markdown Discount)
        )
 
        ecm_src_configure
index 60c1cdb8a5567f47913abe2ea1180c2224e6d07d..18487f6d525a40dbac47758d3a82952fa4b5a39c 100644 (file)
@@ -34,7 +34,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package X X11)
        )
        ecm_src_configure
 }
index d9e229bf3684e69786fd07b8bb44e368082ab304..04358de4be21c7203e7d65e1215a9b3935d6b4a2 100644 (file)
@@ -58,11 +58,11 @@ DEPEND="${RDEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package bittorrent KF5Torrent)
-               $(cmake-utils_use_find_package gpg Gpgmepp)
-               $(cmake-utils_use_find_package kde LibKWorkspace)
-               $(cmake-utils_use_find_package mms LibMms)
-               $(cmake-utils_use_find_package sqlite Sqlite)
+               $(cmake_use_find_package bittorrent KF5Torrent)
+               $(cmake_use_find_package gpg Gpgmepp)
+               $(cmake_use_find_package kde LibKWorkspace)
+               $(cmake_use_find_package mms LibMms)
+               $(cmake_use_find_package sqlite Sqlite)
        )
 
        ecm_src_configure
index a56211843edf38599757914a66bcb38d359a9124..94dd97550a52de1feec53daba884ca5cc83495a8 100644 (file)
@@ -69,14 +69,14 @@ PATCHES=( "${FILESDIR}/${P}-libssh-0.9.2.patch" )
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package activities KF5Activities)
-               $(cmake-utils_use_find_package man Gperf)
-               $(cmake-utils_use_find_package mtp Mtp)
-               $(cmake-utils_use_find_package openexr OpenEXR)
-               $(cmake-utils_use_find_package phonon Phonon4Qt5)
-               $(cmake-utils_use_find_package samba Samba)
-               $(cmake-utils_use_find_package sftp libssh)
-               $(cmake-utils_use_find_package taglib Taglib)
+               $(cmake_use_find_package activities KF5Activities)
+               $(cmake_use_find_package man Gperf)
+               $(cmake_use_find_package mtp Mtp)
+               $(cmake_use_find_package openexr OpenEXR)
+               $(cmake_use_find_package phonon Phonon4Qt5)
+               $(cmake_use_find_package samba Samba)
+               $(cmake_use_find_package sftp libssh)
+               $(cmake_use_find_package taglib Taglib)
        )
 
        ecm_src_configure
index 42f68be2437908b2e7bfe2124cb858bc074d56ba..774b2986a741a602babcd4a560a0f20c4b80f725 100644 (file)
@@ -45,10 +45,10 @@ DEPEND="${RDEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package flashexport KF5Archive)
-               $(cmake-utils_use_find_package mediawiki KF5MediaWiki)
-               $(cmake-utils_use_find_package remotestorage KF5KIO)
-               $(cmake-utils_use_find_package vkontakte KF5Vkontakte)
+               $(cmake_use_find_package flashexport KF5Archive)
+               $(cmake_use_find_package mediawiki KF5MediaWiki)
+               $(cmake_use_find_package remotestorage KF5KIO)
+               $(cmake_use_find_package vkontakte KF5Vkontakte)
        )
 
        ecm_src_configure
index 976c60aad0712ae8e35e27efa9578ed514ed4b21..bf9e81d344dbfc1ead21070dd3b1e1fb36f696ea 100644 (file)
@@ -37,8 +37,8 @@ RDEPEND="${DEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package barcode ZXing)
-               $(cmake-utils_use_find_package pdf Poppler)
+               $(cmake_use_find_package barcode ZXing)
+               $(cmake_use_find_package pdf Poppler)
        )
        ecm_src_configure
 }
index d0416181a0dbf47d4ff1138312651d685a0ceff1..9f71e566a721c3c183bf0a0b79e683e8e5ebdccf 100644 (file)
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package keyboardfocus QAccessibilityClient)
+               $(cmake_use_find_package keyboardfocus QAccessibilityClient)
        )
 
        ecm_src_configure
index ac41d89c361f26dfb4426c97fe41d27a21e6f006..06539e35dd323e72e3d0e710397c0c8e9da7c253 100644 (file)
@@ -48,9 +48,9 @@ RDEPEND="${DEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package alsa ALSA)
-               $(cmake-utils_use_find_package pulseaudio Canberra)
-               $(cmake-utils_use_find_package pulseaudio PulseAudio)
+               $(cmake_use_find_package alsa ALSA)
+               $(cmake_use_find_package pulseaudio Canberra)
+               $(cmake_use_find_package pulseaudio PulseAudio)
        )
 
        ecm_src_configure
index f4ed9fedf665270699ef4b4b324f2c4d33c98c0f..88db4c65a6c6890cf19e3c5fa16fd7a6bd68ff4c 100644 (file)
@@ -68,8 +68,8 @@ RDEPEND="${DEPEND}
 src_configure() {
 #      local mycmakeargs=(
 #      # FIXME: Does not build (last checked 2016-02-17)
-#              $(cmake-utils_use_find_package X Qt5X11Extras)
-#              $(cmake-utils_use_find_package X X11)
+#              $(cmake_use_find_package X Qt5X11Extras)
+#              $(cmake_use_find_package X X11)
 #      )
 
        ecm_src_configure
index 415c5dfa90eebdf3a42a313f754680728ddf90d7..d36d2ed74b35022e4f38cb0a59183019af5a4275 100644 (file)
@@ -38,7 +38,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package scanner KF5Sane)
+               $(cmake_use_find_package scanner KF5Sane)
        )
 
        ecm_src_configure
index 57da29eb84ebe3b7cf9c4f5c7b2a3f06d70425d6..fbf41c362937b9987aa46768df2f3558b3390dcf 100644 (file)
@@ -82,10 +82,10 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package activities KF5Activities)
-               $(cmake-utils_use_find_package speech Qt5TextToSpeech)
-               $(cmake-utils_use_find_package tidy LibTidy)
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package activities KF5Activities)
+               $(cmake_use_find_package speech Qt5TextToSpeech)
+               $(cmake_use_find_package tidy LibTidy)
+               $(cmake_use_find_package X X11)
        )
        ecm_src_configure
 }
index 661c542361cf3574228fc0f66aef85c55abb939b..4904b5fcf7f11cb32b5621a8724aa8d0d557f0ad 100644 (file)
@@ -54,7 +54,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package X X11)
        )
 
        ecm_src_configure
index 00f2f319dcf1b4de195db8ba2273643f0c3fef16..4952e7c638c50719dfaa5c098f8db4e048cf77ce 100644 (file)
@@ -89,7 +89,7 @@ RESTRICT+=" test"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package X X11)
        )
 
        ecm_src_configure
index dfa48267080a26044d1dea9350e7c1e48f9daa04..4656d5e51080718eb21714927ebddaa2e779a97a 100644 (file)
@@ -44,7 +44,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package vnc LibVNCServer)
+               $(cmake_use_find_package vnc LibVNCServer)
        )
 
        ecm_src_configure
index fb0eab568011eadf27e8c6ff23ec05ac1088864b..067909c47a66601a1f238fd90802da0490951811 100644 (file)
@@ -49,7 +49,7 @@ PATCHES=( "${FILESDIR}/${P}-portal-support.patch" )
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package wayland PipeWire)
+               $(cmake_use_find_package wayland PipeWire)
        )
 
        ecm_src_configure
index 3af08979d5f137df2cb8a356b015f2f6a4cda49b..e5ba0376468be1f421ffa7ccfdb26fbdd0b7aed7 100644 (file)
@@ -38,7 +38,7 @@ PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch )
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package X X11)
        )
 
        ecm_src_configure
index 26df9cdb51675807df8f8f4bbce3ad28c3bea3bf..31a0ab8d2ca2a95a445d9b9aa8591b791eb4b243 100644 (file)
@@ -47,7 +47,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package opengl OpenGL)
+               $(cmake_use_find_package opengl OpenGL)
        )
 
        ecm_src_configure
index eda448fa7d9f5bc9695819555c3fb43c7cbc861c..c87c2792a65d766947593e89db8747327632cdbf 100644 (file)
@@ -59,7 +59,7 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package systemd Journald)
+               $(cmake_use_find_package systemd Journald)
        )
        ecm_src_configure
 }
index 3b388fd9ed01868986137d64f9f4c758ba3e5989..08d64688781d714858c32c32af39b50b78d54e00 100644 (file)
@@ -57,8 +57,8 @@ RDEPEND="${COMMON_DEPEND}
 src_configure() {
        local mycmakeargs=(
                -DCOMPILE_QML=OFF
-               $(cmake-utils_use_find_package X X11)
-               $(cmake-utils_use_find_package X Qt5X11Extras)
+               $(cmake_use_find_package X X11)
+               $(cmake_use_find_package X Qt5X11Extras)
        )
        ecm_src_configure
 }
index 868710153aa8659d117a1b8d8ed19cc7c50aaeab..2893eaeb8bda5f52ffefd7aefa2a52f3179df50e 100644 (file)
@@ -60,10 +60,10 @@ PATCHES=( "${FILESDIR}/${P}-telepathy-0.9.8.patch" )
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package sso KAccounts)
-               $(cmake-utils_use_find_package sso AccountsQt5)
-               $(cmake-utils_use_find_package otr Libgcrypt)
-               $(cmake-utils_use_find_package otr LibOTR)
+               $(cmake_use_find_package sso KAccounts)
+               $(cmake_use_find_package sso AccountsQt5)
+               $(cmake_use_find_package otr Libgcrypt)
+               $(cmake_use_find_package otr LibOTR)
        )
 
        ecm_src_configure
index 12436c5228f859f7582f8dcec8ddfed113f161b8..d1422b7d58f18105bb1b015dbf74b11251ace665 100644 (file)
@@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package speech Qt5TextToSpeech)
+               $(cmake_use_find_package speech Qt5TextToSpeech)
        )
 
        ecm_src_configure
index c12a1395c99370d0c6aee8d0f270d0bfdfee7e6f..b2d82770ae26676db73393f0e52a156c3d7443c5 100644 (file)
@@ -46,7 +46,7 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package musicbrainz MusicBrainz5)
+               $(cmake_use_find_package musicbrainz MusicBrainz5)
        )
 
        ecm_src_configure
index e8dd9b411f0077f9ce34e8b3df4aed3a0d7d60ed..451bcb2f6dcdc5658cd2fed9085adcd546826f51 100644 (file)
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package alsa ALSA)
+               $(cmake_use_find_package alsa ALSA)
        )
        ecm_src_configure
 }
index 055a90284b926791d5d8080037b5e10451d9fd2c..dec3f5d07ca72d5539520d1aaf7c2ac1f0789844 100644 (file)
@@ -38,7 +38,7 @@ RDEPEND="${COMMON_DEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package fancyviewer KF5PimTextEdit)
+               $(cmake_use_find_package fancyviewer KF5PimTextEdit)
        )
 
        ecm_src_configure
index a5063c07068472052deaf1f4095e22ffac299b13..460ccddb20ba1bb0f27e8f45c4b91df2dc4055a4 100644 (file)
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package kwallet KF5Wallet)
+               $(cmake_use_find_package kwallet KF5Wallet)
        )
        ecm_src_configure
 }
index 4932a8f01b414444e8c682ea9a31034e5de00c45..6df0dd699d31fc8be30d945fde8901499edecb60 100644 (file)
@@ -74,16 +74,16 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package aprs Perl)
-               $(cmake-utils_use_find_package geolocation Qt5Positioning)
+               $(cmake_use_find_package aprs Perl)
+               $(cmake_use_find_package geolocation Qt5Positioning)
                -DBUILD_MARBLE_TESTS=$(usex test)
                -DWITH_DESIGNER_PLUGIN=$(usex designer)
                -DWITH_libgps=$(usex gps)
                -DWITH_KF5=$(usex kde)
                -DWITH_Phonon4Qt5=$(usex phonon)
                -DWITH_libshp=$(usex shapefile)
-               $(cmake-utils_use_find_package webengine Qt5WebEngine)
-               $(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
+               $(cmake_use_find_package webengine Qt5WebEngine)
+               $(cmake_use_find_package webengine Qt5WebEngineWidgets)
                -DWITH_libwlocate=OFF
                # bug 608890
                -DKDE_INSTALL_CONFDIR="/etc/xdg"
@@ -91,6 +91,6 @@ src_configure() {
        if use kde; then
                ecm_src_configure
        else
-               cmake-utils_src_configure
+               cmake_src_configure
        fi
 }
index da6668a7e8178e1e7da2c361c322c7d3fcc6302c..db0d75ca2e0a336445790a3e6ab68f29c771be5f 100644 (file)
@@ -91,6 +91,6 @@ src_configure() {
        if use kde; then
                ecm_src_configure
        else
-               cmake-utils_src_configure
+               cmake_src_configure
        fi
 }
index 8856309f02990f138d36bccb3cb50e829986b72f..0e62728af08e1ba5e4ce443be80d3004f2e7d0ee 100644 (file)
@@ -82,19 +82,19 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package chm CHM)
-               $(cmake-utils_use_find_package crypt Qca-qt5)
-               $(cmake-utils_use_find_package djvu DjVuLibre)
-               $(cmake-utils_use_find_package epub EPub)
-               $(cmake-utils_use_find_package image-backend KF5KExiv2)
-               $(cmake-utils_use_find_package markdown Discount)
-               $(cmake-utils_use_find_package mobi QMobipocket)
-               $(cmake-utils_use_find_package pdf Poppler)
-               $(cmake-utils_use_find_package plucker JPEG)
-               $(cmake-utils_use_find_package postscript LibSpectre)
-               $(cmake-utils_use_find_package share KF5Purpose)
-               $(cmake-utils_use_find_package speech Qt5TextToSpeech)
-               $(cmake-utils_use_find_package tiff TIFF)
+               $(cmake_use_find_package chm CHM)
+               $(cmake_use_find_package crypt Qca-qt5)
+               $(cmake_use_find_package djvu DjVuLibre)
+               $(cmake_use_find_package epub EPub)
+               $(cmake_use_find_package image-backend KF5KExiv2)
+               $(cmake_use_find_package markdown Discount)
+               $(cmake_use_find_package mobi QMobipocket)
+               $(cmake_use_find_package pdf Poppler)
+               $(cmake_use_find_package plucker JPEG)
+               $(cmake_use_find_package postscript LibSpectre)
+               $(cmake_use_find_package share KF5Purpose)
+               $(cmake_use_find_package speech Qt5TextToSpeech)
+               $(cmake_use_find_package tiff TIFF)
        )
 
        ecm_src_configure
index 4124e27822eb3c339547b34b829217f429604aa3..dc4e3fcc1757fffdada72dff3803c9fd60a79b70 100644 (file)
@@ -49,8 +49,8 @@ RDEPEND="${DEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package kipi KF5Kipi)
-               $(cmake-utils_use_find_package share KF5Purpose)
+               $(cmake_use_find_package kipi KF5Kipi)
+               $(cmake_use_find_package share KF5Purpose)
        )
        ecm_src_configure
 }
index b2e34d926751ee992d641a49888506be6ccedcae..724db3cc44b486d33528bd1f55375ad9f6e10932 100644 (file)
@@ -57,8 +57,8 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package gsl GSL)
-               $(cmake-utils_use_find_package qalculate Qalculate)
+               $(cmake_use_find_package gsl GSL)
+               $(cmake_use_find_package qalculate Qalculate)
        )
        ecm_src_configure
 }
index db2d077bf3c0a4b454771c195ab46f9503add940..7373230f606e1dc54c2ba5c8ac4941f9ed2fe9d6 100644 (file)
@@ -28,8 +28,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package raw KF5KExiv2)
-               $(cmake-utils_use_find_package raw KF5KDcraw)
+               $(cmake_use_find_package raw KF5KExiv2)
+               $(cmake_use_find_package raw KF5KDcraw)
        )
 
        ecm_src_configure
index 46e4d915997bc647c826210f6828359630bb2e25..27032b5cab5c9d156bf2b4c4513ce7adb13e43de 100644 (file)
@@ -50,8 +50,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package absolute-position KF5Wayland)
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package absolute-position KF5Wayland)
+               $(cmake_use_find_package X X11)
        )
 
        ecm_src_configure
index d1b0467d611ba58fb00743cd06f46d9201c506b4..1f739c4be18ada748a9399b0d0d1bf010a99421f 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 KDE_ORG_NAME="breeze-icons"
 PVCUT=$(ver_cut 1-2)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Breeze SVG icon theme binary resource"
 LICENSE="LGPL-3"
@@ -22,7 +22,7 @@ DEPEND="test? ( dev-qt/qttest:5 )"
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        use test || cmake_comment_add_subdirectory autotests
 }
 
@@ -31,5 +31,5 @@ src_configure() {
                -DBINARY_ICONS_RESOURCE=ON
                -DSKIP_INSTALL_ICONS=ON
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 224d82462d7884b35f216fcf02b6ef523693a7a2..c2883745399e8af537d4656ff3c2913d90f640ba 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 KDE_ORG_NAME="breeze-icons"
 PVCUT=$(ver_cut 1-2)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Breeze SVG icon theme binary resource"
 LICENSE="LGPL-3"
@@ -22,7 +22,7 @@ DEPEND="test? ( dev-qt/qttest:5 )"
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        use test || cmake_comment_add_subdirectory autotests
 }
 
@@ -31,5 +31,5 @@ src_configure() {
                -DBINARY_ICONS_RESOURCE=ON
                -DSKIP_INSTALL_ICONS=ON
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index cd68543e69d5922751ae6cfb6aef11e97e3ca6ba..8198eb0fc5a08fa6c5ddd3f57fed99be2d51de5d 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 PVCUT=$(ver_cut 1-2)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Breeze SVG icon theme"
 LICENSE="LGPL-3"
@@ -21,7 +21,7 @@ DEPEND="test? ( dev-qt/qttest:5 )"
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        use test || cmake_comment_add_subdirectory autotests
 }
 
@@ -29,5 +29,5 @@ src_configure() {
        local mycmakeargs=(
                -DBINARY_ICONS_RESOURCE=OFF
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 53e0bf3e9e9590e513b6e67888f0d532b0151dda..5b06e76d15769e2365e44a206f58ceb9836b1820 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 PVCUT=$(ver_cut 1-2)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Breeze SVG icon theme"
 LICENSE="LGPL-3"
@@ -21,7 +21,7 @@ DEPEND="test? ( dev-qt/qttest:5 )"
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        use test || cmake_comment_add_subdirectory autotests
 }
 
@@ -29,5 +29,5 @@ src_configure() {
        local mycmakeargs=(
                -DBINARY_ICONS_RESOURCE=OFF
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 85906ba2af72dec931a5f07405e1364850ab4ea3..620ba795aed689916857f416450c2d76daed6940 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
 QTMIN=5.12.3
-inherit cmake-utils kde.org python-any-r1
+inherit cmake kde.org python-any-r1
 
 DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
@@ -45,7 +45,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        # Requires PyQt5, bug #680256
        sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
                tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
@@ -60,7 +60,7 @@ src_configure() {
                -DBUILD_TESTING=$(usex test)
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
@@ -70,5 +70,5 @@ src_test() {
                -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
        )
 
-       cmake-utils_src_test
+       cmake_src_test
 }
index e07020736632bcccab404eb23c55fb79398b6422..9578cefaa022495011bf64b8a7f89fb915700075 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
 QTMIN=5.12.3
-inherit cmake-utils kde.org python-any-r1
+inherit cmake kde.org python-any-r1
 
 DESCRIPTION="Extra modules and scripts for CMake"
 HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
@@ -45,7 +45,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        # Requires PyQt5, bug #680256
        sed -i -e "/^if(NOT SIP_Qt5Core_Mod_FILE)/s/NOT SIP_Qt5Core_Mod_FILE/TRUE/" \
                tests/CMakeLists.txt || die "failed to disable GenerateSipBindings tests"
@@ -60,7 +60,7 @@ src_configure() {
                -DBUILD_TESTING=$(usex test)
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
@@ -70,5 +70,5 @@ src_test() {
                -E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
        )
 
-       cmake-utils_src_test
+       cmake_src_test
 }
index 3ddc4945e821dfbd62ea67d1f432250544686c09..d12e52dd57fcbc8dac93e65456cc72983964d089 100644 (file)
@@ -47,9 +47,9 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package appstream AppStreamQt)
-               $(cmake-utils_use_find_package appstream packagekitqt5)
-               $(cmake-utils_use_find_package X XCB)
+               $(cmake_use_find_package appstream AppStreamQt)
+               $(cmake_use_find_package appstream packagekitqt5)
+               $(cmake_use_find_package X XCB)
        )
 
        ecm_src_configure
index a0dffa9bbfc92e43ddc4a2a5ce5ae8df860a167e..b3690978c3c9a40a6890f170cc2e859839386a8d 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_SINGLE_IMPL="true"
 PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-utils kde.org distutils-r1
+inherit cmake kde.org distutils-r1
 
 DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
 LICENSE="BSD-2"
index ea0ca77ae3e309357173b6e1c565b1ed49ea073f..1a77a68557008f04dfb43a3cb9b0cf552195ca55 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_SINGLE_IMPL="true"
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils kde.org distutils-r1
+inherit cmake kde.org distutils-r1
 
 DESCRIPTION="Framework for building KDE API documentation in a standard format and style"
 LICENSE="BSD-2"
index 3251783c33da74ef15617cbf98dde1e82589f2a4..de1cc4c198fac3090dfc135f3bc0eacb973274b0 100644 (file)
@@ -19,8 +19,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package bzip2 BZip2)
-               $(cmake-utils_use_find_package lzma LibLZMA)
+               $(cmake_use_find_package bzip2 BZip2)
+               $(cmake_use_find_package lzma LibLZMA)
        )
 
        ecm_src_configure
index fbba76fa30dd5d3576e9fdde3d5cd58df1b856e2..3ed2c9c33f0d244698766a38efea1ec581c86c23 100644 (file)
@@ -28,7 +28,7 @@ PDEPEND="policykit? ( kde-plasma/polkit-kde-agent )"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package policykit PolkitQt5-1)
+               $(cmake_use_find_package policykit PolkitQt5-1)
        )
 
        ecm_src_configure
index dcc9b20d539473fa36a457961b96a0d8039521da..f8908e92d73ae72663e8328095470322043ea38b 100644 (file)
@@ -33,7 +33,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package man KF5DocTools)
+               $(cmake_use_find_package man KF5DocTools)
        )
 
        ecm_src_configure
index 4b4f210e073347c08daef7ad54ed16e8974dc72e..683f6a50460faa8786f68a790b1d5064ee6a417d 100644 (file)
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
 src_configure() {
        local mycmakeargs=(
                -D_KDE4_DEFAULT_HOME_POSTFIX=4
-               $(cmake-utils_use_find_package fam FAM)
+               $(cmake_use_find_package fam FAM)
        )
 
        ecm_src_configure
index d7c18d4c5f20605e4eb87d37d7e2be2a10709a79..87f6881057cb3226bfa3a544ff72d1712d59eee0 100644 (file)
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package X Qt5X11Extras)
+               $(cmake_use_find_package X Qt5X11Extras)
        )
 
        ecm_src_configure
index d80304cf27cd4db0a29eeb93732ab574448ff364..6aa0176414b4981332b6e08c94eab1e20b693168 100644 (file)
@@ -32,7 +32,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package man KF5DocTools)
+               $(cmake_use_find_package man KF5DocTools)
        )
 
        ecm_src_configure
index 3440f2eda860f1fa3c26c5063940e31c39558420..3881fcb428ecce6fb9f24ab1f241a20faec47837 100644 (file)
@@ -89,7 +89,7 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package X X11)
        )
 
        ecm_src_configure
index a75d91720d09375d5fcc5f90a9688a8b0a4f59fd..2441d53b9ae47e84d326e1c855b1649da99020e0 100644 (file)
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package X X11)
        )
 
        ecm_src_configure
index 7bafdb2c6495898ae00be77f249f46750d1361d7..f4c0272e364efde9606abb38772aca57b9783c39 100644 (file)
@@ -26,7 +26,7 @@ RDEPEND="${DEPEND}"
 src_configure() {
        local mycmakeargs=(
                -DCMAKE_DISABLE_FIND_PACKAGE_DNSSD=ON
-               $(cmake-utils_use_find_package zeroconf Avahi)
+               $(cmake_use_find_package zeroconf Avahi)
        )
 
        ecm_src_configure
index 35d6d85892554c83baa9395af4bd7739ff41d256..fc88979f223f1a54f8e02f84d0a08f414efbe3ce 100644 (file)
@@ -31,7 +31,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" )
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package nls KF5I18n)
+               $(cmake_use_find_package nls KF5I18n)
        )
 
        ecm_src_configure
index 2b31c81bfb902021d55fb8c1047fc9fda466b989..566ddc0a61fba7cb728baaf855546b7a073a53d6 100644 (file)
@@ -43,12 +43,12 @@ pkg_setup() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package epub EPub)
-               $(cmake-utils_use_find_package exif LibExiv2)
-               $(cmake-utils_use_find_package ffmpeg FFmpeg)
-               $(cmake-utils_use_find_package office KF5Archive)
-               $(cmake-utils_use_find_package pdf Poppler)
-               $(cmake-utils_use_find_package taglib Taglib)
+               $(cmake_use_find_package epub EPub)
+               $(cmake_use_find_package exif LibExiv2)
+               $(cmake_use_find_package ffmpeg FFmpeg)
+               $(cmake_use_find_package office KF5Archive)
+               $(cmake_use_find_package pdf Poppler)
+               $(cmake_use_find_package taglib Taglib)
        )
 
        ecm_src_configure
index 1d0b39c2bde2c5691c617f9aaec1366421eb3399..8a9c1f2857c2e840deb37c7c3b7190bdf7ae5e8f 100644 (file)
@@ -65,7 +65,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package X X11)
        )
 
        ecm_src_configure
index eab3e0c9bd5d5a4b203cafb0f0982efce913a231..bb27aa7fd8588997347d6da2b9927ca7d6caecb9 100644 (file)
@@ -39,8 +39,8 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package X X11)
-               $(cmake-utils_use_find_package X XCB)
+               $(cmake_use_find_package X X11)
+               $(cmake_use_find_package X XCB)
        )
 
        ecm_src_configure
index 6b9c334ca767d561d6dc5696cf8e329fc605731b..b91459e8fb228680ab9215e250d24b11065df0c9 100644 (file)
@@ -29,8 +29,8 @@ DOCS=( src/imageformats/AUTHORS )
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package eps Qt5PrintSupport)
-               $(cmake-utils_use_find_package openexr OpenEXR)
+               $(cmake_use_find_package eps Qt5PrintSupport)
+               $(cmake_use_find_package openexr OpenEXR)
        )
 
        ecm_src_configure
index 54018f71740b71bd43b9cde39af7b1088b1aebd1..5a833209f9a7ddda83d852260cfcfb51c7475314 100644 (file)
@@ -39,10 +39,10 @@ DEPEND="${RDEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package caps Libcap)
-               $(cmake-utils_use_find_package man KF5DocTools)
-               $(cmake-utils_use_find_package X X11)
-               $(cmake-utils_use_find_package X XCB)
+               $(cmake_use_find_package caps Libcap)
+               $(cmake_use_find_package man KF5DocTools)
+               $(cmake_use_find_package X X11)
+               $(cmake_use_find_package X XCB)
        )
 
        ecm_src_configure
index f0c269e691036eb9c15f88bbed4183a476bb88a1..34785618f4ffb7a081dc1cd99d61b32523cc87e8 100644 (file)
@@ -72,11 +72,11 @@ RESTRICT+=" test"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package acl ACL)
-               $(cmake-utils_use_find_package handbook KF5DocTools)
-               $(cmake-utils_use_find_package kerberos GSSAPI)
-               $(cmake-utils_use_find_package kwallet KF5Wallet)
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package acl ACL)
+               $(cmake_use_find_package handbook KF5DocTools)
+               $(cmake_use_find_package kerberos GSSAPI)
+               $(cmake_use_find_package kwallet KF5Wallet)
+               $(cmake_use_find_package X X11)
        )
 
        ecm_src_configure
index 5d29bbb6e1aa5336911ae8628a8f0eb2707c7a50..92d2b3e8509e1a84eec89ac1fcb38227dc34e9f5 100644 (file)
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package X X11)
        )
 
        ecm_src_configure
index 5e19dd092f643318a0076b98ea59f8884df0616c..c195e26014393f7412522448fa3da150bb541a8a 100644 (file)
@@ -40,10 +40,10 @@ DEPEND="${RDEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package dbus dbusmenu-qt5)
-               $(cmake-utils_use_find_package !phonon Canberra)
-               $(cmake-utils_use_find_package speech Qt5TextToSpeech)
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package dbus dbusmenu-qt5)
+               $(cmake_use_find_package !phonon Canberra)
+               $(cmake_use_find_package speech Qt5TextToSpeech)
+               $(cmake_use_find_package X X11)
        )
 
        ecm_src_configure
index bc535752d8cbe7fcabe3b46468e5882cb0c0ee30..b9138694cf7dfa84c8609d16bfc7daafd9b8fe99 100644 (file)
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package man KF5DocTools)
+               $(cmake_use_find_package man KF5DocTools)
        )
 
        ecm_src_configure
index 613744fa2872f1894d46ea29bf33b79e9f1e02d8..f83627ab4a75c00285761a996d94239da87427ab 100644 (file)
@@ -36,7 +36,7 @@ RESTRICT+=" test"
 src_configure() {
        local mycmakeargs=(
                -DAPPLICATIONS_MENU_NAME=kf5-applications.menu
-               $(cmake-utils_use_find_package man KF5DocTools)
+               $(cmake_use_find_package man KF5DocTools)
        )
 
        ecm_src_configure
index 498e30c6e64133d304aabec9e5b69698096dde97..f9065805ba307751863dbe02c2d7a0e19d3622c6 100644 (file)
@@ -50,8 +50,8 @@ RESTRICT+=" test"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package editorconfig EditorConfig)
-               $(cmake-utils_use_find_package git LibGit2)
+               $(cmake_use_find_package editorconfig EditorConfig)
+               $(cmake_use_find_package git LibGit2)
        )
 
        ecm_src_configure
index d994f5e788ad8d6a8b6e3811e5e9d5d5b4d71ecf..d8770b9aecb257abad503dcc7166333db1a673ce 100644 (file)
@@ -33,7 +33,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package speech Qt5TextToSpeech)
+               $(cmake_use_find_package speech Qt5TextToSpeech)
        )
 
        ecm_src_configure
index 46130c8eb563580a4e1942eb589fda8abb0f4f79..27eaf81c3fac8e844a01806e43e5de929b945611 100644 (file)
@@ -35,8 +35,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package gpg Gpgmepp)
-               $(cmake-utils_use_find_package man KF5DocTools)
+               $(cmake_use_find_package gpg Gpgmepp)
+               $(cmake_use_find_package man KF5DocTools)
        )
 
        ecm_src_configure
index a5db9730b1eb0272dc4e9eb8d247181e3ec809e5..7d996b7b0415bcd87f89c57fba0e186122d0a3b6 100644 (file)
@@ -36,7 +36,7 @@ DOCS=( docs/README.kstartupinfo )
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package X X11)
        )
 
        ecm_src_configure
index d805564322c3ccf932136055a90011db7b083097..8fb4be784bbf33d1c439423c05c55533d2ac256e 100644 (file)
@@ -39,7 +39,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package attica KF5Attica)
+               $(cmake_use_find_package attica KF5Attica)
        )
 
        ecm_src_configure
index 85631fd3536421d929766b0d40ab4ee664a6ec90..002a37c18a52db75ba0cdf74e86bf3153f0007c3 100644 (file)
@@ -6,7 +6,7 @@ EAPI=7
 KDE_ORG_NAME="oxygen-icons5"
 PVCUT=$(ver_cut 1-2)
 QTMIN=5.12.3
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Oxygen SVG icon theme"
 LICENSE="LGPL-3"
@@ -23,6 +23,6 @@ DEPEND="test? ( dev-qt/qttest:5 )"
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        use test || cmake_comment_add_subdirectory autotests
 }
index e821e17f2db4319d48086720decd4127f2e4df66..3dd7f64eecd52118e8824e8fd1d0595eae115de4 100644 (file)
@@ -6,7 +6,7 @@ EAPI=7
 KDE_ORG_NAME="oxygen-icons5"
 PVCUT=$(ver_cut 1-2)
 QTMIN=5.12.3
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Oxygen SVG icon theme"
 LICENSE="LGPL-3"
@@ -23,6 +23,6 @@ DEPEND="test? ( dev-qt/qttest:5 )"
 RESTRICT+=" !test? ( test )"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        use test || cmake_comment_add_subdirectory autotests
 }
index 0d3c7980ecd07c3aeb3732fe60a6eec11a6281d8..41d92a57f3e8708237003665e9fbbf236565ac0a 100644 (file)
@@ -63,11 +63,11 @@ RESTRICT+=" test"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package !gles2 OpenGL)
-               $(cmake-utils_use_find_package wayland EGL)
-               $(cmake-utils_use_find_package wayland KF5Wayland)
-               $(cmake-utils_use_find_package X X11)
-               $(cmake-utils_use_find_package X XCB)
+               $(cmake_use_find_package !gles2 OpenGL)
+               $(cmake_use_find_package wayland EGL)
+               $(cmake_use_find_package wayland KF5Wayland)
+               $(cmake_use_find_package X X11)
+               $(cmake_use_find_package X XCB)
        )
 
        ecm_src_configure
index 039dfd034ffc0b747b70a9f35a824e9aa2ec7e31..9f0a527b6bcf005f4aaf6e9312a7d499eedb9dfe 100644 (file)
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package qml Qt5Quick)
+               $(cmake_use_find_package qml Qt5Quick)
        )
 
        ecm_src_configure
index 4d8eb524eed0d91989f45f5af57172f46127ef15..507d517316522377d743044e5c7b5ee90d70b596 100644 (file)
@@ -26,8 +26,8 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package aspell ASPELL)
-               $(cmake-utils_use_find_package hunspell HUNSPELL)
+               $(cmake_use_find_package aspell ASPELL)
+               $(cmake_use_find_package hunspell HUNSPELL)
        )
 
        ecm_src_configure
index 16d096057aa1aa1aea1ac02e7166fab5aaa81294..719b921fb5453f6cbbab02344514f4e5adaad3cb 100644 (file)
@@ -61,8 +61,8 @@ src_configure() {
        local mycmakeargs=(
                -DEXPERIMENTALAPP_ENABLED=$(usex app)
                -DBLUETOOTH_ENABLED=$(usex bluetooth)
-               $(cmake-utils_use_find_package mousepad LibFakeKey)
-               $(cmake-utils_use_find_package wayland KF5Wayland)
+               $(cmake_use_find_package mousepad LibFakeKey)
+               $(cmake_use_find_package wayland KF5Wayland)
        )
 
        kde5_src_configure
index d5506fd01fd8b2b89a37a45c96af9db0a4bfeedf..ee3fa9dff697803063a6c4e62b98c2b54a678e32 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kde.org xdg
+inherit cmake kde.org xdg
 
 DESCRIPTION="Shutdown manager for desktop environments like KDE Plasma"
 HOMEPAGE="https://kshutdown.sourceforge.io"
@@ -51,7 +51,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.0-cmake-3.15.patch" )
 S="${WORKDIR}/${P/_/-}"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -59,5 +59,5 @@ src_configure() {
                -DKS_PURE_QT=$(usex !kde)
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 5070732abf47c1e23092e901a2cdf5adc1f80d9a..e7f810df4dceb66442962c56b3f0e9f6d37e843d 100644 (file)
@@ -74,15 +74,15 @@ RESTRICT+=" test"
 src_configure() {
        local mycmakeargs=(
                -DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
-               $(cmake-utils_use_find_package cddb KF5Cddb)
-               $(cmake-utils_use_find_package discid CDIO)
-               $(cmake-utils_use_find_package pdf Poppler)
-               $(cmake-utils_use_find_package scanner KF5Sane)
-               $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-               $(cmake-utils_use_find_package taglib Taglib)
+               $(cmake_use_find_package cddb KF5Cddb)
+               $(cmake_use_find_package discid CDIO)
+               $(cmake_use_find_package pdf Poppler)
+               $(cmake_use_find_package scanner KF5Sane)
+               $(cmake_use_find_package semantic-desktop KF5FileMetaData)
+               $(cmake_use_find_package taglib Taglib)
                -DENABLE_WEBCAM=$(usex v4l)
-               $(cmake-utils_use_find_package xmp Exempi)
-               $(cmake-utils_use_find_package yaz Yaz)
+               $(cmake_use_find_package xmp Exempi)
+               $(cmake_use_find_package yaz Yaz)
        )
 
        ecm_src_configure
index 93c70d79cfcfd5962b5c69e678743dd126d92b6e..488078f2e1c13c6370a5382619c8b023c84a84a9 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 KFMIN=5.64.0
 PVCUT=$(ver_cut 1-3)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Breeze theme for Plymouth"
 
@@ -24,5 +24,5 @@ src_configure() {
                -DDISTRO_VERSION=
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index d7a631cf4e52d5bd31ec45e791cc91f4c597397c..dbfeb6dfa5331a942615cfd10db6d34eda82784f 100644 (file)
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_MIN_VERSION=3.14.3
 ECM_HANDBOOK="forceoptional"
 KFMIN=5.64.0
 PVCUT=$(ver_cut 1-3)
@@ -20,6 +19,7 @@ IUSE="gles2 ieee1394 +opengl +pci wayland"
 
 REQUIRED_USE="wayland? ( || ( gles2 opengl ) )"
 
+BDEPEND=">=dev-util/cmake-3.14.3"
 COMMON_DEPEND="
        >=kde-frameworks/kcmutils-${KFMIN}:5
        >=kde-frameworks/kcompletion-${KFMIN}:5
index abee8f43a0cd9a1968989c4f6b3551ac8958bb3f..58eff74a1328fecfcbe771ff07192bf292e6d4c2 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 PVCUT=$(ver_cut 1-3)
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Wallpapers for the Plasma workspace"
 
index 7f4929f6181ef517b3e8c29736b4f2ed3c0423de..f2088176430b771156ec417eda616175dc4b7188 100644 (file)
@@ -7,7 +7,7 @@ KDE_ORG_NAME="plasma-workspace"
 KFMIN=5.64.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.12.3
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays"
 HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md"
@@ -37,7 +37,7 @@ S="${S}/${PN}"
 PATCHES=( "${FILESDIR}/${PN}-5.14.90-standalone.patch" )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \
                -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt"
index 78e5b56d06270d361b312584788d4b05a9ea397f..fa227d0bc5e966204193a9e462917c1520107db1 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Mail client based on KDE Frameworks"
 HOMEPAGE="https://kube-project.com"
@@ -47,7 +47,7 @@ PATCHES=(
 )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        sed -e "/find_package.*Qt5/s/ Concurrent//" \
                -i {extensions/api,framework}/src/CMakeLists.txt || die
index f6b3d85cf534ddae5f0ffd0ef4044f12d846b77c..a6f81504d4eb3a3acc9b74d0d92019ad54e69c00 100644 (file)
@@ -10,7 +10,7 @@ else
        SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
        KEYWORDS="~amd64 ~x86"
 fi
-inherit cmake-utils virtualx xdg
+inherit cmake virtualx xdg
 
 DESCRIPTION="A Qt IMAP e-mail client"
 HOMEPAGE="http://trojita.flaska.net/"
@@ -51,7 +51,7 @@ DEPEND="${RDEPEND}
 DOCS=( README LICENSE )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # the build system is taking a look at `git describe ... --dirty` and
        # gentoo's modifications to CMakeLists.txt break these
@@ -72,9 +72,9 @@ src_configure() {
                -DWITH_ZLIB=$(usex zlib)
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
-       virtx cmake-utils_src_test
+       virtx cmake_src_test
 }
index 8b30b380b54ec76ae0d9f738318efe2d530d9d0f..7a9327fbcb30b2c0253a3f0e8cba7dbdb0a62197 100644 (file)
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_MIN_VERSION=3.14.3
 inherit kde5 toolchain-funcs
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
@@ -23,6 +22,7 @@ LICENSE="GPL-2"
 IUSE="addressbook calendar dnn +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
 
 BDEPEND="
+       >=dev-util/cmake-3.14.3
        sys-devel/gettext
        panorama? (
                sys-devel/bison
@@ -134,23 +134,23 @@ src_configure() {
                -DENABLE_APPSTYLES=ON
                -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
                -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook)
-               $(cmake-utils_use_find_package calendar KF5CalendarCore)
+               $(cmake_use_find_package calendar KF5CalendarCore)
                -DENABLE_FACESENGINE_DNN=$(usex dnn)
-               $(cmake-utils_use_find_package gphoto2 Gphoto2)
-               $(cmake-utils_use_find_package imagemagick ImageMagick)
-               $(cmake-utils_use_find_package lensfun LensFun)
-               $(cmake-utils_use_find_package marble Marble)
+               $(cmake_use_find_package gphoto2 Gphoto2)
+               $(cmake_use_find_package imagemagick ImageMagick)
+               $(cmake_use_find_package lensfun LensFun)
+               $(cmake_use_find_package marble Marble)
                -DENABLE_MEDIAPLAYER=$(usex mediaplayer)
-               $(cmake-utils_use_find_package mediaplayer QtAV)
+               $(cmake_use_find_package mediaplayer QtAV)
                -DENABLE_MYSQLSUPPORT=$(usex mysql)
                -DENABLE_INTERNALMYSQL=$(usex mysql)
-               $(cmake-utils_use_find_package opengl OpenGL)
-               $(cmake-utils_use_find_package panorama KF5ThreadWeaver)
-               $(cmake-utils_use_find_package scanner KF5Sane)
-               $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
-               $(cmake-utils_use_find_package vkontakte KF5Vkontakte)
+               $(cmake_use_find_package opengl OpenGL)
+               $(cmake_use_find_package panorama KF5ThreadWeaver)
+               $(cmake_use_find_package scanner KF5Sane)
+               $(cmake_use_find_package semantic-desktop KF5FileMetaData)
+               $(cmake_use_find_package vkontakte KF5Vkontakte)
                -DENABLE_QWEBENGINE=$(usex !webkit)
-               $(cmake-utils_use_find_package X X11)
+               $(cmake_use_find_package X X11)
        )
 
        kde5_src_configure
index c47f0fb32aa9506ad903770bfb0e945cd393f1ca..9ee9030d8c61e35a01a68de86317b73b39df45a7 100644 (file)
@@ -3,7 +3,6 @@
 
 EAPI=7
 
-CMAKE_MIN_VERSION=3.14.3
 KFMIN=5.60.0
 QTMIN=5.12.3
 inherit ecm kde.org toolchain-funcs
@@ -26,6 +25,7 @@ SLOT="5"
 IUSE="addressbook calendar dnn heif +imagemagick gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X"
 
 BDEPEND="
+       >=dev-util/cmake-3.14.3
        sys-devel/gettext
        panorama? (
                sys-devel/bison
index 2a3a8d42bf7047c5451cb9ca2013ab4d793614da..752ae5dc4358ff34bb1d2667f4fbdebb32f58f8a 100644 (file)
@@ -53,9 +53,9 @@ DOCS=( ChangeLog README.md )
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package kipi KF5Kipi)
-               $(cmake-utils_use_find_package map KF5KGeoMap)
-               $(cmake-utils_use_find_package raw KF5KDcraw)
+               $(cmake_use_find_package kipi KF5Kipi)
+               $(cmake_use_find_package map KF5KGeoMap)
+               $(cmake_use_find_package raw KF5KDcraw)
        )
 
        kde5_src_configure
index 4f1797aa00646fa012cfa4f7ed073793d6caf518..4c9525d74aae15b48ed834f8710c8bdbd55cf9aa 100644 (file)
@@ -98,18 +98,18 @@ src_configure() {
        addpredict /dev/dri
 
        local mycmakeargs=(
-               $(cmake-utils_use_find_package color-management OCIO)
-               $(cmake-utils_use_find_package fftw FFTW3)
-               $(cmake-utils_use_find_package gif GIF)
-               $(cmake-utils_use_find_package gsl GSL)
-               $(cmake-utils_use_find_package heif HEIF)
-               $(cmake-utils_use_find_package jpeg JPEG)
-               $(cmake-utils_use_find_package openexr OpenEXR)
-               $(cmake-utils_use_find_package pdf Poppler)
-               $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-               $(cmake-utils_use_find_package raw LibRaw)
-               $(cmake-utils_use_find_package tiff TIFF)
-               $(cmake-utils_use_find_package vc Vc)
+               $(cmake_use_find_package color-management OCIO)
+               $(cmake_use_find_package fftw FFTW3)
+               $(cmake_use_find_package gif GIF)
+               $(cmake_use_find_package gsl GSL)
+               $(cmake_use_find_package heif HEIF)
+               $(cmake_use_find_package jpeg JPEG)
+               $(cmake_use_find_package openexr OpenEXR)
+               $(cmake_use_find_package pdf Poppler)
+               $(cmake_use_find_package qtmedia Qt5Multimedia)
+               $(cmake_use_find_package raw LibRaw)
+               $(cmake_use_find_package tiff TIFF)
+               $(cmake_use_find_package vc Vc)
        )
 
        kde5_src_configure
index 8d45b1ca065ad0a8232e33436ac16dca6ef63209..99703d1a2126533179da72c8dbc1bfdc9047b901 100644 (file)
@@ -96,18 +96,18 @@ src_configure() {
        addpredict /dev/dri
 
        local mycmakeargs=(
-               $(cmake-utils_use_find_package color-management OCIO)
-               $(cmake-utils_use_find_package fftw FFTW3)
-               $(cmake-utils_use_find_package gif GIF)
-               $(cmake-utils_use_find_package gsl GSL)
-               $(cmake-utils_use_find_package heif HEIF)
-               $(cmake-utils_use_find_package jpeg JPEG)
-               $(cmake-utils_use_find_package openexr OpenEXR)
-               $(cmake-utils_use_find_package pdf Poppler)
-               $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-               $(cmake-utils_use_find_package raw LibRaw)
-               $(cmake-utils_use_find_package tiff TIFF)
-               $(cmake-utils_use_find_package vc Vc)
+               $(cmake_use_find_package color-management OCIO)
+               $(cmake_use_find_package fftw FFTW3)
+               $(cmake_use_find_package gif GIF)
+               $(cmake_use_find_package gsl GSL)
+               $(cmake_use_find_package heif HEIF)
+               $(cmake_use_find_package jpeg JPEG)
+               $(cmake_use_find_package openexr OpenEXR)
+               $(cmake_use_find_package pdf Poppler)
+               $(cmake_use_find_package qtmedia Qt5Multimedia)
+               $(cmake_use_find_package raw LibRaw)
+               $(cmake_use_find_package tiff TIFF)
+               $(cmake_use_find_package vc Vc)
        )
 
        ecm_src_configure
index 5605351edcd4f384e5b326b101362178f4a75769..eb126309b0bc6966ce52116a04a7bf62a171cdc4 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 if [[ ${PV} == "9999" ]]; then
        EGIT_REPO_URI="https://github.com/oyranos-cms/Synnefo.git"
        inherit git-r3
index 33eb7fb67ef577626c6613c66cdc5f1df43becc0..c539e6a7b1fad041a034bcc40d7a66bd779c7036 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 COMMIT=44331654256df83bc1d3cbb271a8ce3d4c464686
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Collection of libraries to integrate Last.fm services"
 HOMEPAGE="https://github.com/lastfm/liblastfm"
@@ -47,5 +47,5 @@ src_configure() {
                -DBUILD_TESTS=$(usex test)
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index bbbf7fcfea314d2e400a81b335b52e76b06e6104..c6a9d624180f7965d596ead45edf2c5678756122 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Graphical effect and filter library by KDE"
 HOMEPAGE="https://websvn.kde.org/trunk/kdesupport/qimageblitz/"
@@ -36,5 +36,5 @@ src_configure() {
        )
        use ppc && mycmakeargs+=( -DHAVE_ALTIVEC=$(usex altivec) )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 4adb838f82d5848702234c7b582a59c5ccf5bb6c..11c5d26ece1feea81ea4457f3d11fcbf16118819 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C++ bindings for GStreamer with a Qt-style API"
 HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
@@ -50,5 +50,5 @@ src_configure() {
                -DQTGSTREAMER_TESTS=$(usex test)
                -DQT_VERSION=5
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index f63c5f1bc002ee79277b102dab400ba2633a5712..9c38a368dd06a9ac2439bd7b8c41e1b511e2b7bf 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Unofficial taglib plugins maintained by the Amarok team"
 HOMEPAGE="https://websvn.kde.org/trunk/kdesupport/taglib-extras/"
index 1632e5bcc70660ff0853b6e122c5c5b6f1763a9d..8a437d07071ca3df46a61095ea74773601986223 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="C++ Multi-format 1D/2D barcode image processing library"
 HOMEPAGE="https://github.com/nu-book/zxing-cpp"
index 05ee35f510944ad3e0c5968f153995759f8ff3f5..b29c21cf27344f7e6f10d5152b777cf183573368 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
-inherit cmake-utils l10n qmake-utils xdg
+inherit cmake l10n qmake-utils xdg
 
 DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
 HOMEPAGE="https://github.com/CDrummond/cantata"
@@ -77,7 +77,7 @@ src_prepare() {
                rm "translations/${PN}_${1}".ts || die
        }
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # Unbundle 3rd party libs
        rm -r 3rdparty/{ebur128,qtsingleapplication} || die
@@ -106,7 +106,7 @@ src_configure() {
                -DENABLE_UDISKS2=ON
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_postinst() {
index c76b6148043484cba3de6244b35b4ffdd5439282..cf6137ec098e7cc1227daab934fdb248add630d1 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
 HOMEPAGE="http://drumstick.sourceforge.net/"
@@ -41,7 +41,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO )
 RESTRICT="test"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        if ! use fluidsynth ; then
                sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
@@ -58,19 +58,19 @@ src_prepare() {
 src_configure() {
        local mycmakeargs=(
                -DBUILD_TESTING=OFF
-               $(cmake-utils_use_find_package doc Doxygen)
+               $(cmake_use_find_package doc Doxygen)
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
-       use doc && cmake-utils_src_compile doxygen
+       cmake_src_compile
+       use doc && cmake_src_compile doxygen
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        if use doc ; then
                dodoc -r "${BUILD_DIR}"/doc/html
index f6de2bd3fcc82a525c70b5c1cc5266ea0ca32c57..fbb7e14743ecf0779f24529c6d6fab71deb89184 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
 HOMEPAGE="http://drumstick.sourceforge.net/"
@@ -41,7 +41,7 @@ DOCS=( AUTHORS ChangeLog NEWS README TODO )
 RESTRICT="test"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        if ! use fluidsynth ; then
                sed -i -e "/pkg_check_modules(FLUIDSYNTH/d" \
@@ -58,19 +58,19 @@ src_prepare() {
 src_configure() {
        local mycmakeargs=(
                -DBUILD_TESTING=OFF
-               $(cmake-utils_use_find_package doc Doxygen)
+               $(cmake_use_find_package doc Doxygen)
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
-       use doc && cmake-utils_src_compile doxygen
+       cmake_src_compile
+       use doc && cmake_src_compile doxygen
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        if use doc ; then
                dodoc -r "${BUILD_DIR}"/doc/html
index 87343373f369f1213de0f22cbe0f2e8bebf6d901..172085a01f3f0a7b686c738fc33b04747ba3925f 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Simple tag editor based on Qt"
 HOMEPAGE="https://kid3.sourceforge.io/"
@@ -58,7 +58,7 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
        # overengineered upstream build system
-       cmake-utils_src_prepare
+       cmake_src_prepare
        # applies broken python hacks, bug #614950
        cmake_comment_add_subdirectory doc
 }
@@ -80,5 +80,5 @@ src_configure() {
                mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 9b1848ffad55b7d961bad3ab4cab7f9f0293227d..5fdb331230722624718821f2694cab220a9a2cf3 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Simple tag editor based on Qt"
 HOMEPAGE="https://kid3.sourceforge.io/"
@@ -59,7 +59,7 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
        # overengineered upstream build system
-       cmake-utils_src_prepare
+       cmake_src_prepare
        # applies broken python hacks, bug #614950
        cmake_comment_add_subdirectory doc
 }
@@ -81,5 +81,5 @@ src_configure() {
                mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 8adf01c87da43407cdb69223c5b1d6f773c1dbe1..d690d480762155ac90ffc7843a32c2512da8677f 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="MIDI based metronome using ALSA sequencer"
 HOMEPAGE="http://kmetronome.sourceforge.net/"
@@ -30,5 +30,5 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
index ad1eb0048ef8827d9646c0fd46af000c33bba755..f2d6d2da99ec2d6c8ddc6fa0a3671878daa585a7 100644 (file)
@@ -40,7 +40,7 @@ RDEPEND="${DEPEND}
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package semantic-desktop KF5Baloo)
+               $(cmake_use_find_package semantic-desktop KF5Baloo)
        )
 
        kde5_src_configure
index 58043f6d38ead8d210ee0d685807744a61c09e26..4466c1784b95a386c121221aa92e0bc5f886762f 100644 (file)
@@ -59,11 +59,11 @@ S="${WORKDIR}/SubtitleComposer-${PV}"
 src_configure() {
        local mycmakeargs=(
                -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bug 616706
-               $(cmake-utils_use_find_package gstreamer GStreamer)
-               $(cmake-utils_use_find_package mpv MPV)
-               $(cmake-utils_use_find_package unicode ICU)
-               $(cmake-utils_use_find_package xine Xine)
-               $(cmake-utils_use_find_package xine X11)
+               $(cmake_use_find_package gstreamer GStreamer)
+               $(cmake_use_find_package mpv MPV)
+               $(cmake_use_find_package unicode ICU)
+               $(cmake_use_find_package xine Xine)
+               $(cmake_use_find_package xine X11)
        )
 
        kde5_src_configure
index 4d597025108d8f5ab06185a07b888d94ae17d3b4..96d27704336865123e87829ca2725f00f1c3328c 100644 (file)
@@ -51,10 +51,10 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package attica KF5Attica)
-               $(cmake-utils_use_find_package konqueror KF5Parts)
-               $(cmake-utils_use_find_package konqueror KF5WebKit)
-               $(cmake-utils_use_find_package telepathy TelepathyQt5)
+               $(cmake_use_find_package attica KF5Attica)
+               $(cmake_use_find_package konqueror KF5Parts)
+               $(cmake_use_find_package konqueror KF5WebKit)
+               $(cmake_use_find_package telepathy TelepathyQt5)
        )
 
        kde5_src_configure
index 7b1f0f864bb1eac89eeec6b85eb2cf3557c6e26c..133d38ba0b76ce4c1227970fc1f5868e01caa976 100644 (file)
@@ -60,7 +60,7 @@ PATCHES=(
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package crypt Qca-qt5)
+               $(cmake_use_find_package crypt Qca-qt5)
        )
 
        kde5_src_configure
index c004a9cffb9e1a8beaa0c5aede4a824a669db91f..b0175ce32225de1fef6edb1057711cb047ace674 100644 (file)
@@ -11,7 +11,7 @@ else
        EGIT_REPO_URI="https://github.com/euroelessar/${PN}.git"
 fi
 
-inherit cmake-utils ${GIT_ECLASS}
+inherit cmake ${GIT_ECLASS}
 
 DESCRIPTION="Qt XMPP library"
 HOMEPAGE="https://github.com/euroelessar/jreen"
@@ -33,5 +33,5 @@ src_configure() {
        local mycmakeargs=(
                -DJREEN_FORCE_QT4=OFF
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 1f505982cf39e2819c56c62fe394f0346048e55a..54ad156b963ebc8825685c40d126f51aeadce90f 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{5,6,7} )
-inherit python-any-r1 cmake-utils virtualx
+inherit python-any-r1 cmake virtualx
 
 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol"
 HOMEPAGE="https://telepathy.freedesktop.org/"
@@ -61,7 +61,7 @@ src_configure() {
                -DENABLE_TESTS=$(usex test)
                -DENABLE_EXAMPLES=OFF
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
@@ -70,6 +70,6 @@ src_test() {
                -E "(BaseConnectionManager|BaseProtocol)"
        )
        pushd "${BUILD_DIR}" > /dev/null || die
-       virtx cmake-utils_src_test
+       virtx cmake_src_test
        popd > /dev/null || die
 }
index 443883b0dbca46c0c43a39ae6286b91d49e15597..fe3574adf3d364cfe059da2680b2d8e368bd679c 100644 (file)
@@ -95,7 +95,7 @@ src_configure() {
                -DENABLE_LOGVIEWER_PLUGIN=$(usex logviewer)
                -DENABLE_MAGNETGENERATOR_PLUGIN=$(usex magnetgenerator)
                -DENABLE_MEDIAPLAYER_PLUGIN=$(usex mediaplayer)
-               $(cmake-utils_use_find_package rss KF5Syndication)
+               $(cmake_use_find_package rss KF5Syndication)
                -DENABLE_SCANFOLDER_PLUGIN=$(usex scanfolder)
                -DENABLE_SEARCH_PLUGIN=$(usex search)
                -DENABLE_SHUTDOWN_PLUGIN=$(usex shutdown)
index 37fbdb6ba508e9dc80c8fa60dcf54d57754732d5..e0851ef4ce80e409f0ca9eb64e4c503a8513cd41 100644 (file)
@@ -65,11 +65,11 @@ RDEPEND="${COMMON_DEPEND}
 src_configure() {
        local mycmakeargs=(
                -DFETCH_TRANSLATIONS=OFF
-               $(cmake-utils_use_find_package fits CFitsio)
-               $(cmake-utils_use_find_package indi INDI)
-               $(cmake-utils_use_find_package password Qt5Keychain)
-               $(cmake-utils_use_find_package raw LibRaw)
-               $(cmake-utils_use_find_package wcs WCSLIB)
+               $(cmake_use_find_package fits CFitsio)
+               $(cmake_use_find_package indi INDI)
+               $(cmake_use_find_package password Qt5Keychain)
+               $(cmake_use_find_package raw LibRaw)
+               $(cmake_use_find_package wcs WCSLIB)
        )
 
        kde5_src_configure
index bcc1c779389fd7756794c0b85daf57a88b11fe3f..11712ad2839b92144b5083995cd3630e87d0261b 100644 (file)
@@ -77,11 +77,11 @@ src_configure() {
        local mycmakeargs=(
                -DFETCH_TRANSLATIONS=OFF
                -DBUILD_DOC=$(usex handbook)
-               $(cmake-utils_use_find_package fits CFitsio)
-               $(cmake-utils_use_find_package indi INDI)
-               $(cmake-utils_use_find_package password Qt5Keychain)
-               $(cmake-utils_use_find_package raw LibRaw)
-               $(cmake-utils_use_find_package wcs WCSLIB)
+               $(cmake_use_find_package fits CFitsio)
+               $(cmake_use_find_package indi INDI)
+               $(cmake_use_find_package password Qt5Keychain)
+               $(cmake_use_find_package raw LibRaw)
+               $(cmake_use_find_package wcs WCSLIB)
        )
 
        ecm_src_configure
index d36b86d8d0f52c78dc4d61477a689ab2abafbda3..f87a13da483ef888ede36910bfcbcc4c0196a262 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils udev
+inherit cmake udev
 
 DESCRIPTION="INDI Astronomical Control Protocol library"
 HOMEPAGE="https://www.indilib.org/"
@@ -44,13 +44,13 @@ src_configure() {
                -DINDI_BUILD_QT5_CLIENT=OFF
                -DINDI_BUILD_UNITTESTS=$(usex test)
                -DUDEVRULES_INSTALL_DIR="$(get_udevdir)"
-               $(cmake-utils_use_find_package ogg OggTheora)
+               $(cmake_use_find_package ogg OggTheora)
                -DINDI_BUILD_WEBSOCKET=$(usex websocket)
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
-       BUILD_DIR="${BUILD_DIR}"/test cmake-utils_src_test
+       BUILD_DIR="${BUILD_DIR}"/test cmake_src_test
 }
index 6873d44cf9fddea0a0f8b276003af6691a03d5c2..7e85ce613a86f3cd0c2a46755c8e9a6f5f8018aa 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 KDE_ORG_NAME="polkit-qt-1"
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Qt wrapper around polkit-1 client libraries"
 HOMEPAGE="https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/"
@@ -36,5 +36,5 @@ src_configure() {
                -DBUILD_EXAMPLES=OFF
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index b304d003bf05515acb681830bfc5bed868362da3..01a00bd0452a28ea29c8cbceea6b6f6e32f3f87c 100644 (file)
@@ -73,8 +73,8 @@ src_configure() {
                -DCMAKE_DISABLE_FIND_PACKAGE_Shiboken2=ON
                -DCMAKE_DISABLE_FIND_PACKAGE_PythonLibs=ON
                -DDISABLE_DBUS=$(usex !dbus)
-               $(cmake-utils_use_find_package kde KF5Wallet)
-               $(cmake-utils_use_find_package kde KF5KIO)
+               $(cmake_use_find_package kde KF5Wallet)
+               $(cmake_use_find_package kde KF5KIO)
                -DNO_X11=$(usex !X)
        )
        kde5_src_configure
index bc72ee39cb81038f395fac0b714b54e2c41f2523..f237ad81fa5407a0d9bfae25d24a8ca540f80ef7 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 PLOCALES="ar bn ca cs da de es et fi fr hi_IN hu is it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
-inherit cmake-utils l10n systemd user
+inherit cmake l10n systemd user
 
 DESCRIPTION="Simple Desktop Display Manager"
 HOMEPAGE="https://github.com/sddm/sddm"
@@ -56,7 +56,7 @@ PATCHES=(
 )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        disable_locale() {
                sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
@@ -78,11 +78,11 @@ src_configure() {
                -DBUILD_MAN_PAGES=ON
                -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # Create a default.conf as upstream dropped /etc/sddm.conf w/o replacement
        local confd="/usr/share/sddm/sddm.conf.d"
index 47898ba5cf1c284f9fe6812e7e02eea8ad75faa4..285a77b534873b5b3385b9dcee6fbcda626e827c 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils kde.org
+inherit cmake kde.org
 
 DESCRIPTION="Widget styles for Qt and GTK2"
 HOMEPAGE="https://cgit.kde.org/qtcurve.git"
@@ -80,5 +80,5 @@ src_configure() {
                -DQTC_QT5_ENABLE_KDE="$(usex plasma)"
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }