*/*: Switch polynomial-c maintained packages to cmake.eclass
authorAndreas Sturmlechner <asturm@gentoo.org>
Mon, 23 Dec 2019 23:31:33 +0000 (00:31 +0100)
committerAndreas Sturmlechner <asturm@gentoo.org>
Tue, 31 Dec 2019 10:09:36 +0000 (11:09 +0100)
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
25 files changed:
app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
app-admin/keepassxc/keepassxc-2.5.0.ebuild
app-admin/keepassxc/keepassxc-2.5.1.ebuild
app-admin/keepassxc/keepassxc-9999.ebuild
app-shells/fish/fish-3.0.2.ebuild
app-shells/fish/fish-9999.ebuild
dev-libs/libgaminggear/libgaminggear-0.15.1.ebuild
games-emulation/mgba/mgba-0.7.3.ebuild
games-emulation/mgba/mgba-0.8_beta1.ebuild
games-emulation/mgba/mgba-9999.ebuild
games-engines/devilutionx/devilutionx-9999.ebuild
media-sound/clementine/clementine-1.3.1_p20190127.ebuild
media-sound/clementine/clementine-1.3.1_p20190609.ebuild
media-sound/clementine/clementine-1.3.1_p20191004.ebuild
media-sound/clementine/clementine-9999.ebuild
media-sound/lmms/lmms-1.2.0.ebuild
media-sound/lmms/lmms-1.2.1.ebuild
media-sound/lmms/lmms-9999.ebuild
media-sound/pamix/pamix-9999.ebuild
media-video/simplescreenrecorder/simplescreenrecorder-0.3.11-r2.ebuild
media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild
sys-apps/roccat-tools/roccat-tools-5.9.0.ebuild
sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.8.ebuild
sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.9.ebuild
sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild

index 914683fba0df46212b57ad0e74036ad6fa7f42c6..83eb419c119494c04cf6e175da98e3f024a96ee1 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@@ -66,7 +66,7 @@ src_prepare() {
         use test || \
                sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
 
-        cmake-utils_src_prepare
+        cmake_src_prepare
 }
 
 src_configure() {
@@ -84,7 +84,7 @@ src_configure() {
        if [[ "${PV}" == *_beta* ]] ; then
                mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
        fi
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_preinst() {
index 75059bb064ab5e765fb4c3472b28f3254ae09fda..344be63f074173aea0ba75bf321ee22c6dde94f8 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@@ -67,7 +67,7 @@ src_prepare() {
         use test || \
                sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
 
-        cmake-utils_src_prepare
+        cmake_src_prepare
 }
 
 src_configure() {
@@ -86,7 +86,7 @@ src_configure() {
        if [[ "${PV}" == *_beta* ]] ; then
                mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
        fi
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_preinst() {
index 75059bb064ab5e765fb4c3472b28f3254ae09fda..344be63f074173aea0ba75bf321ee22c6dde94f8 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@@ -67,7 +67,7 @@ src_prepare() {
         use test || \
                sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
 
-        cmake-utils_src_prepare
+        cmake_src_prepare
 }
 
 src_configure() {
@@ -86,7 +86,7 @@ src_configure() {
        if [[ "${PV}" == *_beta* ]] ; then
                mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
        fi
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_preinst() {
index 75059bb064ab5e765fb4c3472b28f3254ae09fda..344be63f074173aea0ba75bf321ee22c6dde94f8 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@@ -67,7 +67,7 @@ src_prepare() {
         use test || \
                sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
 
-        cmake-utils_src_prepare
+        cmake_src_prepare
 }
 
 src_configure() {
@@ -86,7 +86,7 @@ src_configure() {
        if [[ "${PV}" == *_beta* ]] ; then
                mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
        fi
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_preinst() {
index 540ec26c1feb9612d5a90a3bd84148a7f6d6f487..3a16d56f7c071c0ff7af592a20dd750f91f1dbb4 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils readme.gentoo-r1
+inherit cmake readme.gentoo-r1
 
 DESCRIPTION="Friendly Interactive SHell"
 HOMEPAGE="http://fishshell.com/"
@@ -45,30 +45,29 @@ src_prepare() {
        # workaround for https://github.com/fish-shell/fish-shell/issues/4883
        sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
                cmake/Tests.cmake || die
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
        local mycmakeargs=(
                -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-               -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
                -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
                -DCURSES_NEED_NCURSES=ON
                -DINTERNAL_WCWIDTH=OFF
                -DBUILD_DOCS="$(usex doc)"
                -DWITH_GETTEXT="$(usex nls)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
        readme.gentoo_create_doc
 }
 
 src_test() {
-       cmake-utils_src_make -j1 test
+       cmake_build -j1 test
 }
 
 pkg_postinst() {
index cf5816108b09db22580ab77acf4d021ec9e0d05f..e718e3cbc309380bf4eefc26d6fbf122824d5548 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils readme.gentoo-r1
+inherit cmake readme.gentoo-r1
 
 DESCRIPTION="Friendly Interactive SHell"
 HOMEPAGE="http://fishshell.com/"
@@ -42,30 +42,29 @@ src_prepare() {
        # workaround for https://github.com/fish-shell/fish-shell/issues/4883
        sed -i 's#${TEST_INSTALL_DIR}/${CMAKE_INSTALL_PREFIX}#${TEST_INSTALL_DIR}#' \
                cmake/Tests.cmake || die
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
        local mycmakeargs=(
                -DCMAKE_INSTALL_BINDIR="${EPREFIX}/bin"
-               -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
                -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
                -DCURSES_NEED_NCURSES=ON
                -DINTERNAL_WCWIDTH=OFF
                -DBUILD_DOCS="$(usex doc)"
                -DWITH_GETTEXT="$(usex nls)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        keepdir /usr/share/fish/vendor_{completions,conf,functions}.d
        readme.gentoo_create_doc
 }
 
 src_test() {
-       cmake-utils_src_make -j1 test
+       cmake_build -j1 test
 }
 
 pkg_postinst() {
index 5a1347b66e799df8875890b448bcd9604b9892bb..40164dbc61bf30876ca511dce32d18d050b4de3f 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Provides functionality for gaming input devices"
 
@@ -39,9 +39,9 @@ PATCHES=(
        "${FILESDIR}"/${P}-cmake-3.13.patch
 )
 
-# Required because xdg.eclass overrides src_prepare() from cmake-utils.eclass
+# Required because xdg.eclass overrides src_prepare() from cmake.eclass
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -49,11 +49,11 @@ src_configure() {
                -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
                -DWITH_DOC="$(usex doc)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 }
 
 pkg_preinst() {
index 013c485228bf5c214e5b4b691eab3122a932954e..759399b0d4b97d045183c68de7e41e8ed442447c 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="Game Boy Advance emulator written in C"
 HOMEPAGE="https://mgba.io"
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
        xdg_environment_reset
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # Get rid of any bundled stuff we don't want
        for pkg in libpng lzma sqlite3 zlib ; do
@@ -79,11 +79,11 @@ src_configure() {
                -DUSE_SQLITE3="$(usex sqlite)"
                -DUSE_ZLIB=ON
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
 }
 
 src_install() {
index 014fe2c0a7ce85d2e7aba7f319b0a1a8179a1faa..035f986d30213124ec34571fb07fe13de6286c70 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="Game Boy Advance emulator written in C"
 HOMEPAGE="https://mgba.io"
@@ -47,7 +47,7 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
        xdg_environment_reset
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # Get rid of any bundled stuff we don't want
        for pkg in libpng lzma sqlite3 zlib ; do
@@ -82,11 +82,11 @@ src_configure() {
                -DUSE_SQLITE3="$(usex sqlite)"
                -DUSE_ZLIB=ON
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
 }
 
 src_install() {
index 014fe2c0a7ce85d2e7aba7f319b0a1a8179a1faa..035f986d30213124ec34571fb07fe13de6286c70 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="Game Boy Advance emulator written in C"
 HOMEPAGE="https://mgba.io"
@@ -47,7 +47,7 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
        xdg_environment_reset
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # Get rid of any bundled stuff we don't want
        for pkg in libpng lzma sqlite3 zlib ; do
@@ -82,11 +82,11 @@ src_configure() {
                -DUSE_SQLITE3="$(usex sqlite)"
                -DUSE_ZLIB=ON
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
 }
 
 src_install() {
index d191d5e659310dbffa77b1ffb4d15b2edb3d79cb..c0684055693c5a97a9fcb0ea5b65bfebe8bfbde0 100644 (file)
@@ -9,7 +9,7 @@ EAPI=7
 #   https://github.com/diasurgical/devilutionX/issues/490
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils desktop
+inherit cmake desktop
 
 DESCRIPTION="Diablo engine for modern operating systems"
 HOMEPAGE="https://github.com/diasurgical/devilutionX"
@@ -42,7 +42,7 @@ src_configure() {
                -DBINARY_RELEASE=ON
                -DDEBUG="$(usex debug)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
index 9aa4ffa1983b0742a805d628c03039635bb09f27..a2bb0b39fd2e5e07edba50b2e099cc0b995ce81c 100644 (file)
@@ -15,7 +15,7 @@ else
        SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
        KEYWORDS="amd64 x86"
 fi
-inherit cmake-utils flag-o-matic l10n virtualx xdg
+inherit cmake flag-o-matic l10n virtualx xdg
 
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
@@ -108,7 +108,7 @@ DOCS=( Changelog README.md )
 src_prepare() {
        l10n_find_plocales_changes "src/translations" "" ".po"
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
        # some tests fail or hang
        sed -i \
                -e '/add_test_file(translations_test.cpp/d' \
@@ -158,7 +158,7 @@ src_configure() {
 
        use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
index c1abcfd676e415b496bd26b6852e89c113344134..3e212f782448be92df121f203afc1a13a1c6092f 100644 (file)
@@ -16,7 +16,7 @@ else
        KEYWORDS="~amd64 ~x86"
        S="${WORKDIR}/${PN^}-${COMMIT}"
 fi
-inherit cmake-utils flag-o-matic l10n virtualx xdg
+inherit cmake flag-o-matic l10n virtualx xdg
 
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
@@ -109,7 +109,7 @@ PATCHES=( "${FILESDIR}/${P}-fix-restore-from-systray.patch" )
 src_prepare() {
        l10n_find_plocales_changes "src/translations" "" ".po"
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
        # some tests fail or hang
        sed -i \
                -e '/add_test_file(translations_test.cpp/d' \
@@ -159,7 +159,7 @@ src_configure() {
 
        use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
index f2d1766fb153cf177a5e30cb4ac7f5448d36d422..4e52840045fa614e9ebced07000554110c9c97c0 100644 (file)
@@ -16,7 +16,7 @@ else
        KEYWORDS="~amd64 ~x86"
        S="${WORKDIR}/${PN^}-${COMMIT}"
 fi
-inherit cmake-utils flag-o-matic l10n virtualx xdg
+inherit cmake flag-o-matic l10n virtualx xdg
 
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
@@ -101,7 +101,7 @@ DOCS=( Changelog README.md )
 src_prepare() {
        l10n_find_plocales_changes "src/translations" "" ".po"
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
        # some tests fail or hang
        sed -i \
                -e '/add_test_file(translations_test.cpp/d' \
@@ -151,7 +151,7 @@ src_configure() {
 
        use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
index 3efe963fe1b39e3db829304929c2e7b8f3a0d27a..be99d91ad509fa1c9f27b6bdd99333613316ca4f 100644 (file)
@@ -14,7 +14,7 @@ else
        KEYWORDS="~amd64 ~x86"
        S="${WORKDIR}/${PN^}-${COMMIT}"
 fi
-inherit cmake-utils flag-o-matic l10n virtualx xdg
+inherit cmake flag-o-matic l10n virtualx xdg
 
 DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
 HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
@@ -98,7 +98,7 @@ DOCS=( Changelog README.md )
 src_prepare() {
        l10n_find_plocales_changes "src/translations" "" ".po"
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
        # some tests fail or hang
        sed -i \
                -e '/add_test_file(translations_test.cpp/d' \
@@ -148,7 +148,7 @@ src_configure() {
 
        use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
index d5f82bfff2a369d486adf793502c3418901c0795..e489666c90fe5a43ed993ce311f7d3501b175c14 100644 (file)
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-# The order is important here! Both, cmake-utils and xdg define src_prepare.
-# We need the one from cmake-utils
-inherit xdg cmake-utils
+# The order is important here! Both, cmake and xdg define src_prepare.
+# We need the one from cmake
+inherit xdg cmake
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -90,7 +90,7 @@ src_configure() {
                -DWANT_VST=$(usex vst)
                -DWANT_SF2=$(usex fluidsynth)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_preinst() {
index d5f82bfff2a369d486adf793502c3418901c0795..e489666c90fe5a43ed993ce311f7d3501b175c14 100644 (file)
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-# The order is important here! Both, cmake-utils and xdg define src_prepare.
-# We need the one from cmake-utils
-inherit xdg cmake-utils
+# The order is important here! Both, cmake and xdg define src_prepare.
+# We need the one from cmake
+inherit xdg cmake
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -90,7 +90,7 @@ src_configure() {
                -DWANT_VST=$(usex vst)
                -DWANT_SF2=$(usex fluidsynth)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_preinst() {
index 66d6fbe1e437a81e5b91d7d43df707856a75776d..376874f97b14ee24838b17552e54479633424381 100644 (file)
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-# The order is important here! Both, cmake-utils and xdg define src_prepare.
-# We need the one from cmake-utils
-inherit xdg cmake-utils
+# The order is important here! Both, cmake and xdg define src_prepare.
+# We need the one from cmake
+inherit xdg cmake
 
 DESCRIPTION="Cross-platform music production software"
 HOMEPAGE="https://lmms.io"
@@ -90,7 +90,7 @@ src_configure() {
                -DWANT_VST=$(usex vst)
                -DWANT_SF2=$(usex fluidsynth)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_preinst() {
index b4f4397507df85b298579a130eecb4f34772e5c3..1e8fad3449247be849188c3d833c763fee2f5c87 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" == 9999 ]] ; then
        inherit git-r3
@@ -34,5 +34,5 @@ src_configure() {
        local mycmakeargs=(
                -DWITH_UNICODE="$(usex unicode)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index ebea68fc269acd100ffc3eed966a1e8869f5601c..54eeceee53ad824cb565079fbc9476cce156bbfe 100644 (file)
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib flag-o-matic xdg
 
 if [[ ${PV} = 9999 ]]; then
@@ -73,8 +74,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-       # required because xdg.eclass overrides default cmake-utils_src_prepare
-       cmake-utils_src_prepare
+       # required because xdg.eclass overrides default cmake_src_prepare
+       cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -105,7 +106,7 @@ multilib_src_configure() {
                )
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_preinst() {
index ebea68fc269acd100ffc3eed966a1e8869f5601c..54eeceee53ad824cb565079fbc9476cce156bbfe 100644 (file)
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib flag-o-matic xdg
 
 if [[ ${PV} = 9999 ]]; then
@@ -73,8 +74,8 @@ pkg_setup() {
 }
 
 src_prepare() {
-       # required because xdg.eclass overrides default cmake-utils_src_prepare
-       cmake-utils_src_prepare
+       # required because xdg.eclass overrides default cmake_src_prepare
+       cmake_src_prepare
 }
 
 multilib_src_configure() {
@@ -105,7 +106,7 @@ multilib_src_configure() {
                )
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_preinst() {
index db2565cfe82291f4ff448c44b4b0ea3b4411ecaa..9be7384e3244bd0f72e1f5c815652b430ed1929d 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit readme.gentoo-r1 cmake-utils udev user xdg
+inherit readme.gentoo-r1 cmake udev user xdg
 
 DESCRIPTION="Utility for advanced configuration of Roccat devices"
 
@@ -74,9 +74,9 @@ pkg_setup() {
        done
 }
 
-# Required because xdg.eclass overrides src_prepare() from cmake-utils.eclass
+# Required because xdg.eclass overrides src_prepare() from cmake.eclass
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -98,11 +98,11 @@ src_configure() {
                fi
        done
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        local stat_dir=/var/lib/roccat
        keepdir ${stat_dir}
        fowners root:roccat ${stat_dir}
index dbd8f4ce067cee09825118e9921aa523a53afb55..96cfef2335390a3afd0568c4eab075099a9b351e 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Android File Transfer for Linux"
 HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}"
 
 # required to override src_prepare from xdg eclass
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -48,7 +48,7 @@ src_configure() {
                -DUSB_BACKEND_LIBUSB="OFF"
                $(usex qt5 '-DDESIRED_QT_VERSION=5' '')
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_preinst() {
index 08a6fef6fea605a33c5e77e36eadb1536663457c..e2ce2ae66cfe417e617ef1cda8c8a366dff48ffb 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Android File Transfer for Linux"
 HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}"
 
 # required to override src_prepare from xdg eclass
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -48,7 +48,7 @@ src_configure() {
                -DUSB_BACKEND_LIBUSB="OFF"
                $(usex qt5 '-DDESIRED_QT_VERSION=5' '')
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_preinst() {
index dbd8f4ce067cee09825118e9921aa523a53afb55..96cfef2335390a3afd0568c4eab075099a9b351e 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Android File Transfer for Linux"
 HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}"
 
 # required to override src_prepare from xdg eclass
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -48,7 +48,7 @@ src_configure() {
                -DUSB_BACKEND_LIBUSB="OFF"
                $(usex qt5 '-DDESIRED_QT_VERSION=5' '')
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_preinst() {