diff options
24 files changed, 60 insertions, 60 deletions
diff --git a/dev-libs/grantlee/grantlee-9999.ebuild b/dev-libs/grantlee/grantlee-9999.ebuild index ed0a2587ae6..966a35c877d 100644 --- a/dev-libs/grantlee/grantlee-9999.ebuild +++ b/dev-libs/grantlee/grantlee-9999.ebuild @@ -4,7 +4,7 @@ EAPI=7 VIRTUALX_REQUIRED="test" -inherit kde.org cmake-utils virtualx +inherit kde.org cmake virtualx DESCRIPTION="C++ string template engine based on the Django template system" HOMEPAGE="https://github.com/steveire/grantlee" @@ -39,21 +39,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 } diff --git a/eclass/ecm.eclass b/eclass/ecm.eclass index 1616df9aab5..79dccdb54fe 100644 --- a/eclass/ecm.eclass +++ b/eclass/ecm.eclass @@ -13,7 +13,7 @@ # upstream release groups (Frameworks, Plasma, Applications) but also for any # other package that follows similar conventions. # -# This eclass unconditionally inherits cmake-utils.eclass and all its public +# This eclass unconditionally inherits cmake.eclass and all its public # variables and helper functions (not phase functions) may be considered as part # of this eclass's API. # @@ -49,7 +49,7 @@ if [[ ${CATEGORY} = kde-frameworks ]] ; then fi : ${ECM_NONGUI:=false} -inherit cmake-utils flag-o-matic toolchain-funcs virtualx +inherit cmake flag-o-matic toolchain-funcs virtualx if [[ ${ECM_NONGUI} = false ]] ; then inherit xdg @@ -74,7 +74,7 @@ EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_test pkg_preinst pkg_po # @ECLASS-VARIABLE: ECM_DEBUG # @DESCRIPTION: -# Add "debug" to IUSE. If !debug, add -DNDEBUG (via cmake-utils_src_configure) +# Add "debug" to IUSE. If !debug, add -DNDEBUG (via cmake_src_configure) # and -DQT_NO_DEBUG to CPPFLAGS. If set to "false", do nothing. : ${ECM_DEBUG:=true} @@ -418,12 +418,12 @@ ecm_pkg_setup() { # @FUNCTION: ecm_src_prepare # @DESCRIPTION: -# Wrapper for cmake-utils_src_prepare with lots of extra logic for magic +# Wrapper for cmake_src_prepare with lots of extra logic for magic # handling of linguas, tests, handbook etc. ecm_src_prepare() { debug-print-function ${FUNCNAME} "$@" - cmake-utils_src_prepare + cmake_src_prepare # only build examples when required if ! { in_iuse examples && use examples; } ; then @@ -499,12 +499,12 @@ ecm_src_prepare() { # @FUNCTION: ecm_src_configure # @DESCRIPTION: -# Wrapper for cmake-utils_src_configure with extra logic for magic handling of +# Wrapper for cmake_src_configure with extra logic for magic handling of # handbook, tests etc. ecm_src_configure() { debug-print-function ${FUNCNAME} "$@" - # we rely on cmake-utils.eclass to append -DNDEBUG too + # we rely on cmake.eclass to append -DNDEBUG too if in_iuse debug && ! use debug; then append-cppflags -DQT_NO_DEBUG fi @@ -548,22 +548,22 @@ ecm_src_configure() { # allow the ebuild to override what we set here mycmakeargs=("${cmakeargs[@]}" "${mycmakeargs[@]}") - cmake-utils_src_configure + cmake_src_configure } # @FUNCTION: ecm_src_compile # @DESCRIPTION: -# Wrapper for cmake-utils_src_compile. Currently doesn't do anything extra, but +# Wrapper for cmake_src_compile. Currently doesn't do anything extra, but # is included as part of the API just in case it's needed in the future. ecm_src_compile() { debug-print-function ${FUNCNAME} "$@" - cmake-utils_src_compile "$@" + cmake_src_compile "$@" } # @FUNCTION: ecm_src_test # @DESCRIPTION: -# Wrapper for cmake-utils_src_test with extra logic for magic handling of dbus +# Wrapper for cmake_src_test with extra logic for magic handling of dbus # and virtualx. ecm_src_test() { debug-print-function ${FUNCNAME} "$@" @@ -573,7 +573,7 @@ ecm_src_test() { export $(dbus-launch) fi - cmake-utils_src_test + cmake_src_test } # When run as normal user during ebuild development with the ebuild command, @@ -595,12 +595,12 @@ ecm_src_test() { # @FUNCTION: ecm_src_install # @DESCRIPTION: -# Wrapper for cmake-utils_src_install. Currently doesn't do anything extra, but +# Wrapper for cmake_src_install. Currently doesn't do anything extra, but # is included as part of the API just in case it's needed in the future. ecm_src_install() { debug-print-function ${FUNCNAME} "$@" - cmake-utils_src_install + cmake_src_install } # @FUNCTION: ecm_pkg_preinst diff --git a/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild b/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild index 629eb7f4edf..44564eafdfc 100644 --- a/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild +++ b/kde-apps/libkleo/libkleo-19.12.49.9999.ebuild @@ -42,5 +42,5 @@ src_configure() { $(cmake_use_find_package fancyviewer KF5PimTextEdit) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/kde-apps/libkleo/libkleo-9999.ebuild b/kde-apps/libkleo/libkleo-9999.ebuild index ce0eaa2ce9e..e16834c1dcc 100644 --- a/kde-apps/libkleo/libkleo-9999.ebuild +++ b/kde-apps/libkleo/libkleo-9999.ebuild @@ -42,5 +42,5 @@ src_configure() { $(cmake_use_find_package fancyviewer KF5PimTextEdit) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/kde-apps/marble/marble-19.12.49.9999.ebuild b/kde-apps/marble/marble-19.12.49.9999.ebuild index 7b6beffb75c..32af1047d7b 100644 --- a/kde-apps/marble/marble-19.12.49.9999.ebuild +++ b/kde-apps/marble/marble-19.12.49.9999.ebuild @@ -91,6 +91,6 @@ src_configure() { if use kde; then ecm_src_configure else - cmake-utils_src_configure + cmake_src_configure fi } diff --git a/kde-apps/marble/marble-9999.ebuild b/kde-apps/marble/marble-9999.ebuild index 2bf11f69ca9..7ef3632f81f 100644 --- a/kde-apps/marble/marble-9999.ebuild +++ b/kde-apps/marble/marble-9999.ebuild @@ -91,6 +91,6 @@ src_configure() { if use kde; then ecm_src_configure else - cmake-utils_src_configure + cmake_src_configure fi } diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild index 26cdce58ab0..8a35f6631b3 100644 --- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild +++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-9999.ebuild @@ -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 } diff --git a/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild b/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild index 5239911101b..fe66fe3c013 100644 --- a/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild +++ b/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild @@ -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 } diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild index c2ec7f0ec3c..4c1801c6a30 100644 --- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild +++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-9999.ebuild @@ -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 } diff --git a/kde-frameworks/kapidox/kapidox-9999.ebuild b/kde-frameworks/kapidox/kapidox-9999.ebuild index fcd51b25f99..e5c4b6fc438 100644 --- a/kde-frameworks/kapidox/kapidox-9999.ebuild +++ b/kde-frameworks/kapidox/kapidox-9999.ebuild @@ -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" diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild index 01cf40a4544..43d18feab7e 100644 --- a/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild +++ b/kde-frameworks/oxygen-icons/oxygen-icons-9999.ebuild @@ -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 } diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.49.9999.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.49.9999.ebuild index 8bc2431d963..d18f1a9e4be 100644 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.49.9999.ebuild +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.17.49.9999.ebuild @@ -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 } diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild index a7aaf8e9151..fae7748f767 100644 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 KFMIN=9999 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 } diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.49.9999.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.49.9999.ebuild index 8e69fdb9eca..1d1536d1d64 100644 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.49.9999.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.17.49.9999.ebuild @@ -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" diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild index 8e69fdb9eca..1d1536d1d64 100644 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild @@ -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" diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.49.9999.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.49.9999.ebuild index 856b16d1c12..01b078a8b9f 100644 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.49.9999.ebuild +++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.17.49.9999.ebuild @@ -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" diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild index c7c68100fc9..7e352c97e32 100644 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild +++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-9999.ebuild @@ -7,7 +7,7 @@ KDE_ORG_NAME="plasma-workspace" KFMIN=9999 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" diff --git a/media-gfx/synnefo/synnefo-9999.ebuild b/media-gfx/synnefo/synnefo-9999.ebuild index 0f1348f34c3..809b601fde0 100644 --- a/media-gfx/synnefo/synnefo-9999.ebuild +++ b/media-gfx/synnefo/synnefo-9999.ebuild @@ -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 diff --git a/media-libs/liblastfm/liblastfm-9999.ebuild b/media-libs/liblastfm/liblastfm-9999.ebuild index a99c695366e..78586180f0e 100644 --- a/media-libs/liblastfm/liblastfm-9999.ebuild +++ b/media-libs/liblastfm/liblastfm-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils git-r3 +inherit cmake git-r3 DESCRIPTION="Collection of libraries to integrate Last.fm services" HOMEPAGE="https://github.com/lastfm/liblastfm" @@ -41,5 +41,5 @@ src_configure() { -DBUILD_TESTS=$(usex test) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild index f3979d206d6..1996bc42141 100644 --- a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild +++ b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild @@ -10,7 +10,7 @@ else EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/${PN}.git" inherit git-r3 fi -inherit cmake-utils +inherit cmake DESCRIPTION="C++ bindings for GStreamer with a Qt-style API" HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html" @@ -47,5 +47,5 @@ src_configure() { -DQTGSTREAMER_TESTS=$(usex test) -DQT_VERSION=5 ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/net-libs/jreen/jreen-9999.ebuild b/net-libs/jreen/jreen-9999.ebuild index 80749366e32..51ad47248fe 100644 --- a/net-libs/jreen/jreen-9999.ebuild +++ b/net-libs/jreen/jreen-9999.ebuild @@ -10,7 +10,7 @@ else inherit git-r3 EGIT_REPO_URI="https://github.com/euroelessar/${PN}.git" fi -inherit cmake-utils +inherit cmake DESCRIPTION="Qt XMPP library" HOMEPAGE="https://github.com/euroelessar/jreen" @@ -32,5 +32,5 @@ src_configure() { local mycmakeargs=( -DJREEN_FORCE_QT4=OFF ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/net-libs/libtmdbqt/libtmdbqt-9999.ebuild b/net-libs/libtmdbqt/libtmdbqt-9999.ebuild index 2e1dd5eb7f0..90b0c509ccf 100644 --- a/net-libs/libtmdbqt/libtmdbqt-9999.ebuild +++ b/net-libs/libtmdbqt/libtmdbqt-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils kde.org +inherit cmake kde.org DESCRIPTION="Qt library to query the movie database API (themoviedb.org)" HOMEPAGE="https://cgit.kde.org/libtmdbqt.git" @@ -24,5 +24,5 @@ src_configure() { -DTMDBQT_ENABLE_TESTS=$(usex test) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild index 7cbea4e3005..93461def566 100644 --- a/net-libs/telepathy-qt/telepathy-qt-9999.ebuild +++ b/net-libs/telepathy-qt/telepathy-qt-9999.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{6,7,8} ) EGIT_REPO_URI=( "https://github.com/TelepathyIM/${PN}" ) -inherit python-any-r1 cmake-utils git-r3 +inherit python-any-r1 cmake git-r3 DESCRIPTION="Qt bindings for the Telepathy D-Bus protocol" HOMEPAGE="https://telepathy.freedesktop.org/" @@ -48,5 +48,5 @@ src_configure() { -DENABLE_TESTS=OFF -DENABLE_EXAMPLES=OFF ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/sys-auth/polkit-qt/polkit-qt-9999.ebuild b/sys-auth/polkit-qt/polkit-qt-9999.ebuild index 23e69a65978..d36e63f1610 100644 --- a/sys-auth/polkit-qt/polkit-qt-9999.ebuild +++ b/sys-auth/polkit-qt/polkit-qt-9999.ebuild @@ -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/" @@ -37,5 +37,5 @@ src_configure() { -DBUILD_EXAMPLES=$(usex examples) ) - cmake-utils_src_configure + cmake_src_configure } |