*/*: Switch proxy-maint to cmake.eclass
authorAndreas Sturmlechner <asturm@gentoo.org>
Mon, 30 Dec 2019 19:12:17 +0000 (20:12 +0100)
committerAndreas Sturmlechner <asturm@gentoo.org>
Tue, 31 Dec 2019 18:42:20 +0000 (19:42 +0100)
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
52 files changed:
app-editors/neovim/neovim-0.3.8.ebuild
app-editors/neovim/neovim-0.4.2.ebuild
app-editors/neovim/neovim-0.4.3.ebuild
app-editors/neovim/neovim-9999.ebuild
app-leechcraft/liblaretz/liblaretz-0.1.2.ebuild
app-misc/vcontrold/vcontrold-0.98.8.ebuild
app-mobilephone/gammu/gammu-1.40.0.ebuild
app-mobilephone/gammu/gammu-1.41.0.ebuild
dev-cpp/gtest/gtest-1.10.0.ebuild
dev-cpp/gtest/gtest-1.8.1-r1.ebuild
dev-cpp/gtest/gtest-1.9.0_pre20190607.ebuild
dev-cpp/gtest/gtest-9999.ebuild
dev-db/percona-xtrabackup/percona-xtrabackup-2.4.15.ebuild
dev-db/percona-xtrabackup/percona-xtrabackup-8.0.7.ebuild
dev-libs/criterion/criterion-2.3.3.ebuild
dev-lua/luv/luv-1.32.0.0.ebuild
games-action/minetest/minetest-5.1.0-r1.ebuild
games-emulation/pcsx2/pcsx2-1.4.0-r2.ebuild
games-emulation/pcsx2/pcsx2-9999.ebuild
games-engines/odamex/odamex-0.8.1-r1.ebuild
games-fps/gzdoom/gzdoom-4.2.4.ebuild
media-gfx/qimgv/qimgv-0.8.5.ebuild
media-gfx/qimgv/qimgv-0.8.8.ebuild
media-libs/Field3D/Field3D-1.7.2.ebuild
media-libs/osl/osl-1.10.5.ebuild
media-libs/partio/partio-1.5.4.ebuild
media-libs/partio/partio-9999.ebuild
media-libs/ptex/ptex-2.3.2.ebuild
media-radio/KochMorse/KochMorse-3.4.0-r1.ebuild
media-video/qmplay2/qmplay2-19.12.19.ebuild
media-video/qmplay2/qmplay2-9999.ebuild
net-libs/libvncserver/libvncserver-0.9.12-r2.ebuild
net-libs/libvncserver/libvncserver-0.9.12-r3.ebuild
net-libs/qxmpp/qxmpp-1.0.1.ebuild
net-misc/seafile-client/seafile-client-6.2.11.ebuild
net-misc/seafile-client/seafile-client-7.0.2.ebuild
net-misc/seafile-client/seafile-client-7.0.4.ebuild
net-proxy/trojan/trojan-1.12.3.ebuild
net-proxy/trojan/trojan-1.13.0.ebuild
net-vpn/i2pd/i2pd-2.27.0.ebuild
net-vpn/i2pd/i2pd-2.28.0.ebuild
net-vpn/i2pd/i2pd-2.29.0.ebuild
sci-physics/geant-vmc/geant-vmc-4.3.6-r1.ebuild
sci-physics/geant-vmc/geant-vmc-4.4.0.ebuild
sci-physics/geant-vmc/geant-vmc-9999.ebuild
sci-physics/vgm/vgm-4.4-r1.ebuild
sci-physics/vgm/vgm-4.5.ebuild
sci-physics/vgm/vgm-9999.ebuild
sys-apps/thunderbolt-software-user-space/thunderbolt-software-user-space-0.9.3-r1.ebuild
x11-apps/copyq/copyq-3.8.0.ebuild
x11-misc/virtualgl/virtualgl-2.6.1-r1.ebuild
x11-misc/virtualgl/virtualgl-9999.ebuild

index b22a6a5ca7c155d461eaa144846142829d79cac2..52b26cd51f4b452991c44161090c0ab7876346a9 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Vim-fork focused on extensibility and agility"
 HOMEPAGE="https://neovim.io"
@@ -62,7 +62,7 @@ src_prepare() {
        sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
                -i src/nvim/globals.h || die
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -71,11 +71,11 @@ src_configure() {
                -DENABLE_JEMALLOC=$(usex jemalloc)
                -DPREFER_LUA=$(usex luajit no yes)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # install a default configuration file
        insinto /etc/vim
index cf111db0b07cb664a2ce955b73963a2313015928..525ec586a27fc8a0ee04fbb546b5b14b9aafbd0d 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils xdg
+inherit cmake eutils xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@@ -58,7 +58,7 @@ src_prepare() {
        sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
                -i src/nvim/globals.h || die
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -66,11 +66,11 @@ src_configure() {
                -DFEAT_TUI=$(usex tui)
                -DPREFER_LUA=$(usex luajit no yes)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # install a default configuration file
        insinto /etc/vim
index d59da9730374ad9f5637d0c8c4b49ca1c186b4d3..6f27a67c108e2bc4366871d18a62a7b7f83d5c81 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils xdg
+inherit cmake eutils xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@@ -58,7 +58,7 @@ src_prepare() {
        sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
                -i src/nvim/globals.h || die
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -66,11 +66,11 @@ src_configure() {
                -DFEAT_TUI=$(usex tui)
                -DPREFER_LUA=$(usex luajit no yes)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # install a default configuration file
        insinto /etc/vim
index 97f2f678904d3e48aff64651c8d6c638cbc1c666..6647b38da75170ba7967e5db561b7f3461c37150 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils eutils xdg
+inherit cmake eutils xdg
 
 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@@ -59,7 +59,7 @@ src_prepare() {
        sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
                -i src/nvim/globals.h || die
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -67,11 +67,11 @@ src_configure() {
                -DFEAT_TUI=$(usex tui)
                -DPREFER_LUA=$(usex luajit no yes)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # install a default configuration file
        insinto /etc/vim
index 5bed8dd43ffc96c7eaa24c0ea5c12de7648e776a..a80f72b52c902273b60e414ef6e4d843c8267a93 100644 (file)
@@ -7,7 +7,7 @@ DESCRIPTION="Shared library to be used by the Laretz sync server and its clients
 HOMEPAGE="https://leechcraft.org"
 SRC_URI="https://github.com/0xd34df00d/${PN#lib}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-inherit cmake-utils
+inherit cmake
 
 LICENSE="Boost-1.0"
 SLOT="0"
index 67b70f6ed21c33b444b877a11abdd991c799ddc3..2e6f68c2c7edb27e5b78309944dc8cde59144ba0 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Daemon for communication with Viessmann Vito heatings"
 HOMEPAGE="https://github.com/openv/vcontrold/"
@@ -22,7 +22,7 @@ src_prepare() {
        sed "s/@VERSION@/${PV}/" "src/version.h.in" \
                > "src/version.h" || die "Setting version failed"
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -32,11 +32,11 @@ src_configure() {
                -DVSIM="$(usex vsim)"
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        doinitd "${FILESDIR}/vcontrold"
        insinto /etc/vcontrold/
        doins -r xml
index 24180c0286c63bdd8e5a58b1011012cd2ec3d9da..d91ec569eed8543c3ccac2675a093d816511adbb 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A tool to handle your cellular phone"
 HOMEPAGE="https://wammu.eu/gammu/"
@@ -47,18 +47,17 @@ src_configure() {
                -DWITH_ODBC=$(usex odbc)
                -DWITH_Postgres=$(usex postgres)
                -DWITH_USB=$(usex usb)
-               -DBUILD_SHARED_LIBS=ON
                -DINSTALL_DOC_DIR="share/doc/${PF}"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
        addwrite "/run/lock/LCK..bar"
-       LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake-utils_src_test -j1
+       LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake_src_test -j1
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        docompress -x /usr/share/doc/${PF}/examples/
 }
index 8be8100b03e19b5fc2bea303ba0a5de91b77b318..2af395f253222ada8c5bc078f0297977456b020f 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A tool to handle your cellular phone"
 HOMEPAGE="https://wammu.eu/gammu/"
@@ -45,18 +45,17 @@ src_configure() {
                -DWITH_ODBC=$(usex odbc)
                -DWITH_Postgres=$(usex postgres)
                -DWITH_USB=$(usex usb)
-               -DBUILD_SHARED_LIBS=ON
                -DINSTALL_DOC_DIR="share/doc/${PF}"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
        addwrite "/run/lock/LCK..bar"
-       LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake-utils_src_test -j1
+       LD_LIBRARY_PATH="${BUILD_DIR}/libgammu" cmake_src_test -j1
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        docompress -x /usr/share/doc/${PF}/examples/
 }
index 98d67d92032c5dc2fee7200a7a5c7ee47622f992..ea624a4fe89b01ddda0f65e162adbdc86850c7e3 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python2_7 pypy )
-
+CMAKE_ECLASS=cmake
 inherit cmake-multilib python-any-r1
 
 MY_PV=1.10.x
@@ -44,7 +44,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        sed -i -e '/set(cxx_base_flags /s:-Werror::' \
                googletest/cmake/internal_utils.cmake || die "sed failed!"
@@ -60,7 +60,7 @@ multilib_src_configure() {
                -Dgtest_build_tests=$(usex test)
                -DPYTHON_EXECUTABLE="${PYTHON}"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 multilib_src_install_all() {
index 771468eb8b6730ca04eaba1e4a2b4d4f1460552b..b610bde2ba4bc061a4f0d8c991a5d8daa5685785 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python2_7 pypy )
-
+CMAKE_ECLASS=cmake
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == "9999" ]]; then
@@ -38,7 +38,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        sed -i -e '/set(cxx_base_flags /s:-Werror::' \
                googletest/cmake/internal_utils.cmake || die "sed failed!"
@@ -54,7 +54,7 @@ multilib_src_configure() {
                -Dgtest_build_tests=$(usex test)
                -DPYTHON_EXECUTABLE="${PYTHON}"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 multilib_src_install_all() {
index 9a6cb10a49fd9c6313535baecb5da3c684cbe85c..a5860df6cada9e4c7c799acfd70108058616c981 100644 (file)
@@ -6,8 +6,8 @@ EAPI=7
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python2_7 pypy )
 
+CMAKE_ECLASS=cmake
 GOOGLETEST_COMMIT=da10da05c262af0a9e8fa91789a272a3dec67655
-
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == "9999" ]]; then
@@ -44,7 +44,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        sed -i -e '/set(cxx_base_flags /s:-Werror::' \
                googletest/cmake/internal_utils.cmake || die "sed failed!"
@@ -60,7 +60,7 @@ multilib_src_configure() {
                -Dgtest_build_tests=$(usex test)
                -DPYTHON_EXECUTABLE="${PYTHON}"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 multilib_src_install_all() {
index 2fdd8d6bb36422fc635d3ed45fd08bf6bfc240dc..2224f1eedf49c7d4641c3ad8958e383bab16dcd5 100644 (file)
@@ -6,6 +6,7 @@ EAPI=7
 # Python is required for tests and some build tasks.
 PYTHON_COMPAT=( python2_7 pypy )
 
+CMAKE_ECLASS=cmake
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == "9999" ]]; then
@@ -42,7 +43,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        sed -i -e '/set(cxx_base_flags /s:-Werror::' \
                googletest/cmake/internal_utils.cmake || die "sed failed!"
@@ -58,7 +59,7 @@ multilib_src_configure() {
                -Dgtest_build_tests=$(usex test)
                -DPYTHON_EXECUTABLE="${PYTHON}"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 multilib_src_install_all() {
index 2ca76ece9d8285b7fe0bb52e70820f8ab2fccc58..9e800bfb475aacd819dad1096de868061d48c34b 100644 (file)
@@ -5,7 +5,7 @@ EAPI="7"
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
 
 DESCRIPTION="Hot backup utility for MySQL based servers"
 HOMEPAGE="https://www.percona.com/software/mysql-database/percona-xtrabackup"
@@ -40,7 +40,7 @@ PATCHES=(
 )
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
 
        # remove bundled libedit, libevent, zlib
        # just to be safe...
@@ -65,7 +65,7 @@ src_configure() {
        )
 
        local CMAKE_BUILD_TYPE="Release"
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
index af0018e27b3c1413d677f8613c386a6af6b0660c..3776aa32ffd365bf81203829eb241281ee3272a4 100644 (file)
@@ -5,7 +5,7 @@ EAPI="7"
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
 
 BOOST_VER="1_69_0"
 MY_PV="$(ver_rs 2 '-')"
@@ -50,7 +50,7 @@ src_configure() {
                -DWITH_SYSTEM_LIBS=ON
        )
        local CMAKE_BUILD_TYPE="Release"
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
index 27a2a9ae8b05f2883b3f3ac6822583da3caeeecd..e0b34016c621568ceed70636fd152db31f1b723d 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Cross platform unit testing framework for C and C++"
 HOMEPAGE="https://github.com/Snaipe/Criterion"
@@ -30,19 +30,19 @@ src_configure() {
                -DCTESTS="$(usex test ON OFF)"
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
 
        if use test; then
-               cmake-utils_src_make criterion_tests
+               cmake_build criterion_tests
        fi
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        if [[ "/usr/lib" != "/usr/$(get_libdir)" ]]; then
                mkdir -p "${D}/usr/$(get_libdir)" || die
index 41098ce6bbc4235f8ead151dd7c40e5f05d62705..3d5ee15c180bf0e24ebeb7cb029bbd8cade82ab0 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils unpacker
+inherit cmake unpacker
 
 # e.g. MY_PV = a.b.c-d
 MY_PV="$(ver_rs 3 -)"
@@ -38,7 +38,7 @@ src_prepare() {
        # Fix libdir
        # Match '/lib/' and '/lib"' without capturing / or ", replacing with libdir
        sed -i -r "s/\/lib(\"|\/)/\/$(get_libdir)\1/g" CMakeLists.txt || die "Failed to sed CMakeLists.txt"
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -50,7 +50,7 @@ src_configure() {
                -DWITH_LUA_ENGINE=$(usex luajit LuaJIT Lua)
                -DWITH_SHARED_LIBUV=ON
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_test() {
index 30beb3bfeb10540ec73b6436c22b97f63d92acb7..018526a2e715802ad13654d6ba789212496e1af5 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
 HOMEPAGE="https://www.minetest.net"
@@ -58,7 +58,7 @@ BDEPEND="
 PATCHES="${FILESDIR}/${PV}-FindJson.patch"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        # set paths
        sed \
                -e "s#@BINDIR@#${EPREFIX}/usr/bin#g" \
@@ -98,20 +98,20 @@ src_configure() {
                -DIRRLICHT_INCLUDE_DIR="${EPREFIX}/usr/include/irrlicht"
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
 
        if use doc ; then
-               cmake-utils_src_compile doc
+               cmake_src_compile doc
                HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
        fi
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        if use server ; then
                keepdir /var/log/minetest
index d31cad3370ad011402b6aa7b29cb61f70fcb526a..11e3f7bd7c969ab3005bb0c004a541f5c9d2f733 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 MY_PV="${PV/_/-}"
 
-inherit cmake-utils multilib wxwidgets
+inherit cmake multilib wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"
@@ -77,11 +77,11 @@ src_configure() {
        )
 
        WX_GTK_VER="3.0" setup-wxwidgets
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
        # Upstream issue: https://github.com/PCSX2/pcsx2/issues/417
        QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
-       cmake-utils_src_install
+       cmake_src_install
 }
index c0a277f41a052bb8def940470d6d2fd5631a3a4e..f5e4931ead16164fc088a81cd3d3951cb2e30a93 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils git-r3 multilib toolchain-funcs wxwidgets
+inherit cmake git-r3 multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"
@@ -83,7 +83,7 @@ src_configure() {
        )
 
        WX_GTK_VER="3.0-gtk3" setup-wxwidgets
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
@@ -92,5 +92,5 @@ src_install() {
        #  https://github.com/PCSX2/pcsx2/issues/3077
        QA_EXECSTACK="usr/bin/PCSX2"
        QA_TEXTRELS="usr/$(get_libdir)/pcsx2/* usr/bin/PCSX2"
-       cmake-utils_src_install
+       cmake_src_install
 }
index c823dedd980d3ebc8413a44e66b05917a6183008..43af64e7752749d5b31dbdd3368157f0ac4aa88b 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 WX_GTK_VER="3.0-gtk3"
-inherit cmake-utils desktop prefix wxwidgets xdg
+inherit cmake desktop prefix wxwidgets xdg
 
 DESCRIPTION="Online multiplayer free software engine for DOOM"
 HOMEPAGE="https://odamex.net/"
@@ -44,7 +44,7 @@ src_prepare() {
 
        use odalaunch && setup-wxwidgets
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -57,11 +57,11 @@ src_configure() {
                -DUSE_MINIUPNP=$(usex upnp)
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
 
        # Build odamex.wad
        cd wad || die "cd failed"
@@ -79,5 +79,5 @@ src_install() {
                fi
        fi
 
-       cmake-utils_src_install
+       cmake_src_install
 }
index da843dc71ad1cb36f5a827203bfde9e0be9270f1..f6844ab0cf13013aef9e8a99e999eada430d633b 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils desktop xdg
+inherit cmake desktop xdg
 
 DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
 HOMEPAGE="https://zdoom.org"
@@ -42,7 +42,7 @@ src_prepare() {
                rm -rf wadsrc_bm wadsrc_extra || die
        fi
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -59,13 +59,13 @@ src_configure() {
                -DNO_OPENMP="$(usex !openmp)"
                -DBUILD_NONFREE="$(usex nonfree)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
        newicon src/posix/zdoom.xpm "${PN}.xpm"
        make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
-       cmake-utils_src_install
+       cmake_src_install
 }
 
 pkg_postinst() {
index 81ac18fca861cda897a989e49a393257f7f89f61..71f3879d11819e2bde4fdda993869abe3aaacac2 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="A cross-platform image viewer with webm support, written in qt5"
 HOMEPAGE="https://github.com/easymodo/qimgv"
@@ -31,7 +31,7 @@ RDEPEND="
 "
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        # respect make.conf CXXFLAGS
        sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -lstdc++fs -O3")/d' CMakeLists.txt || die
 }
@@ -42,7 +42,7 @@ src_configure() {
                -DKDE_SUPPORT=$(usex kde)
                -DVIDEO_SUPPORT=$(usex video)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_postinst() {
index e605fa5db2f8f7c921c5f686a28227e0ae72f55e..b5ebae2923479d5004fb7b3e30655a64e36262d5 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="A cross-platform image viewer with webm support, written in qt5"
 HOMEPAGE="https://github.com/easymodo/qimgv"
@@ -31,7 +31,7 @@ RDEPEND="
 "
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        # respect make.conf CXXFLAGS
        sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -lstdc++fs -O3")/d' CMakeLists.txt || die
 }
@@ -42,7 +42,7 @@ src_configure() {
                -DKDE_SUPPORT=$(usex kde)
                -DVIDEO_SUPPORT=$(usex video)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_postinst() {
index 4fe5e0457742ed10d7feae82f504de739a40c0e6..4cbf036f96607ada3e4053b3b0564933a8637a67 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A library for storing voxel data"
 HOMEPAGE="http://opensource.imageworks.com/?p=field3d"
@@ -29,7 +29,7 @@ src_configure() {
        local mycmakeargs=(
                -DINSTALL_DOCS=OFF # Docs are not finished yet.
                -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-               $(cmake-utils_use_find_package mpi MPI)
+               $(cmake_use_find_package mpi MPI)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index c5326986b7a6c2a67a78a754126dd685cc5671c3..190989d2cc9ee57aee7ddeaf45ffb3361dd2b18a 100644 (file)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils llvm toolchain-funcs
+inherit cmake llvm toolchain-funcs
 
 # check this on updates
 LLVM_MAX_SLOT=8
@@ -73,7 +73,6 @@ src_configure() {
        local gcc=$(tc-getCC)
        # LLVM needs CPP11. Do not disable.
        local mycmakeargs=(
-               -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
                -DENABLERTTI=OFF
                -DINSTALL_DOCS=$(usex doc)
                -DLLVM_STATIC=ON
@@ -84,5 +83,5 @@ src_configure() {
                -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 84a1640572904b4d73bf1bc2e0715311d64c2f90..b582c0e424cf5c1c53749e0dca359d54fdaa4819 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
        inherit git-r3
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package doc Doxygen)
+               $(cmake_use_find_package doc Doxygen)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 1b109fd6da7f61698e2dfab9e7c92c56e2f9aa2c..5404d30fd501148b870278d2665e007abb97960e 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-inherit cmake-utils python-single-r1
+inherit cmake python-single-r1
 
 if [[ ${PV} == *9999 ]]; then
        inherit git-r3
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}"
 
 src_configure() {
        local mycmakeargs=(
-               $(cmake-utils_use_find_package doc Doxygen)
+               $(cmake_use_find_package doc Doxygen)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 48580481fd2b488f6f47de9d2ba2da800a10de20..20e552cd34419a2b75a0e5db4aafa7087781b224 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Per-Face Texture Mapping for Production Rendering"
 HOMEPAGE="http://ptex.us/"
@@ -27,7 +27,7 @@ src_prepare() {
        cat <<-EOF > version || die
        ${PV}
        EOF
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -35,5 +35,5 @@ src_configure() {
                -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}/html"
                -DPTEX_BUILD_STATIC_LIBS=$(usex static-libs)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 745430f452c012eb8220fa2c96908efdd46c583f..190a657b91514f1b1908cdca01005c7cf11e26e1 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Morse-code tutor using the Koch method"
 HOMEPAGE="https://github.com/hmatuschek/kochmorse"
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/kochmorse-${PV}"
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        # Upstream uses a non-standard category in release 3.4.0. I submitted
        # a fix which has been accepted, but not yet released.
        sed -i -e 's/Teaching;/X-Teaching;/' shared/kochmorse.desktop || die
index 4d0ece7c31c7e8c31e7f42dcd5bcdbca9ff0978e..d77ba82ead27096d17ceaacec4d5ef3990e93637 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
 HOMEPAGE="https://github.com/zaps166/QMPlay2"
@@ -73,7 +73,7 @@ src_prepare() {
                -e 's/(install.+QMPlay2\.1)\.gz/\1/' \
                -i src/gui/CMakeLists.txt || die
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -125,7 +125,7 @@ src_configure() {
                mycmakeargs+=( USE_GIT_VERSION=OFF )
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_postinst() {
index 4d0ece7c31c7e8c31e7f42dcd5bcdbca9ff0978e..d77ba82ead27096d17ceaacec4d5ef3990e93637 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
 HOMEPAGE="https://github.com/zaps166/QMPlay2"
@@ -73,7 +73,7 @@ src_prepare() {
                -e 's/(install.+QMPlay2\.1)\.gz/\1/' \
                -i src/gui/CMakeLists.txt || die
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -125,7 +125,7 @@ src_configure() {
                mycmakeargs+=( USE_GIT_VERSION=OFF )
        fi
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_postinst() {
index e25b35dcf37456b3e8642b809ed25015fee3b3e6..373269e6e3497c113b242ad62850091fc7c7f968 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 MY_P="LibVNCServer-${PV}"
 DESCRIPTION="library for creating vnc servers"
@@ -65,5 +65,5 @@ src_configure() {
                -DWITH_IPv6=$(usex ipv6 ON OFF)
                -DWITH_SASL=$(usex sasl ON OFF)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index cedaa4a52fe6de7d1af15135ba31aaa6cac5a400..9661224c2a15754ae9d77c262943e09a385210fc 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 MY_P="LibVNCServer-${PV}"
 DESCRIPTION="library for creating vnc servers"
@@ -69,5 +69,5 @@ src_configure() {
                -DWITH_IPv6=$(usex ipv6 ON OFF)
                -DWITH_SASL=$(usex sasl ON OFF)
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 3085ee7a3745e8378874aa056b81c571636c2857..e56ca1cc2f4424ff594e99e58df2457f99eab7df 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="A cross-platform C++ XMPP client library based on the Qt framework"
 HOMEPAGE="https://github.com/qxmpp-project/qxmpp/"
@@ -40,7 +40,7 @@ src_prepare() {
        sed -e "/qxmpptransfermanager/d" \
                -i tests/CMakeLists.txt || die "failed to drop single test"
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -54,5 +54,5 @@ src_configure() {
                -DWITH_VPX=$(usex vpx)
        )
 
-       cmake-utils_src_configure
+       cmake_src_configure
 }
index 311ec1fd77c622260b80e663986697a95c2be105..77928c949098d6e554fc599c650c2b184e858370 100644 (file)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Seafile desktop client"
 HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
        eapply "${FILESDIR}/${PN}-select-qt5.patch"
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -40,7 +40,7 @@ src_configure() {
                -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
                -DBUILD_TESTING="$(usex test)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_postinst() {
index 972e54b95f82ca95380144da099c260840fc4b77..fa31e1e217d9f8ba4228606a2cfd161db7f9120a 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Seafile desktop client"
 HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
@@ -33,7 +33,7 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 src_prepare() {
        eapply "${FILESDIR}/${PN}-select-qt5.patch"
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -41,7 +41,7 @@ src_configure() {
                -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
                -DBUILD_TESTING="$(usex test)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_postinst() {
index 972e54b95f82ca95380144da099c260840fc4b77..fa31e1e217d9f8ba4228606a2cfd161db7f9120a 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 DESCRIPTION="Seafile desktop client"
 HOMEPAGE="https://github.com/haiwen/seafile-client/ http://www.seafile.com/"
@@ -33,7 +33,7 @@ BDEPEND="dev-qt/linguist-tools:5"
 
 src_prepare() {
        eapply "${FILESDIR}/${PN}-select-qt5.patch"
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -41,7 +41,7 @@ src_configure() {
                -DBUILD_SHIBBOLETH_SUPPORT="$(usex shibboleth)"
                -DBUILD_TESTING="$(usex test)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_postinst() {
index e394deff72a008ef72a2d38af25999dc5ab7d0bc..012870955efaef475eaff6c5489b8b0b77f196c0 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
-inherit cmake-utils python-any-r1 systemd
+inherit cmake python-any-r1 systemd
 
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
 HOMEPAGE="https://github.com/trojan-gfw/${PN}"
@@ -32,16 +32,15 @@ src_configure() {
                -DENABLE_MYSQL=$(usex mysql)
                -DSYSTEMD_SERVICE=ON
                -DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
-               -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        newinitd "${FILESDIR}/trojan.initd" trojan
 }
 
 src_test() {
-       cmake-utils_src_test -j1
+       cmake_src_test -j1
 }
index 64ae387979208302f4c8deffc5598d702a450283..b1e4711248578ae9c813c39da980dd65bfc663d6 100644 (file)
@@ -5,7 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
-inherit cmake-utils python-any-r1 systemd
+inherit cmake python-any-r1 systemd
 
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
 HOMEPAGE="https://github.com/trojan-gfw/trojan"
@@ -33,16 +33,15 @@ src_configure() {
                -DENABLE_MYSQL=$(usex mysql)
                -DSYSTEMD_SERVICE=ON
                -DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
-               -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        newinitd "${FILESDIR}/trojan.initd" trojan
 }
 
 src_test() {
-       cmake-utils_src_test -j1
+       cmake_src_test -j1
 }
index 099b9151f1666469ed72861a3cc792b310f2558e..a24bc8dd650f61689311eafc4f408cdbc5b46915 100644 (file)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit systemd cmake-utils toolchain-funcs
+inherit systemd cmake toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
 HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -67,11 +67,11 @@ src_configure() {
                -DWITH_LIBRARY=ON
                -DWITH_BINARY=ON
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # config
        insinto /etc/i2pd
index 099b9151f1666469ed72861a3cc792b310f2558e..a24bc8dd650f61689311eafc4f408cdbc5b46915 100644 (file)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit systemd cmake-utils toolchain-funcs
+inherit systemd cmake toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
 HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -67,11 +67,11 @@ src_configure() {
                -DWITH_LIBRARY=ON
                -DWITH_BINARY=ON
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # config
        insinto /etc/i2pd
index 5982e199dbce8e43c6a7c87397923990eba5ea74..06d8abe7e5060944f9ae1c0fc43763348c0210c4 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit systemd cmake-utils toolchain-funcs
+inherit systemd cmake toolchain-funcs
 
 DESCRIPTION="A C++ daemon for accessing the I2P anonymous network"
 HOMEPAGE="https://github.com/PurpleI2P/i2pd"
@@ -65,11 +65,11 @@ src_configure() {
                -DWITH_LIBRARY=ON
                -DWITH_BINARY=ON
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
 
        # config
        insinto /etc/i2pd
index b92483ba721f2e764b96126da84a74ae2c416cac..585f02e1660ab4312838800bd2e02a890c1f83c0 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
        inherit git-r3
@@ -52,11 +52,11 @@ src_configure() {
                -DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
                -DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
        if use doc ; then
                local dirs=(
                        source
@@ -83,7 +83,7 @@ src_test() {
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        use doc && local HTML_DOCS=(doc/.)
        einstalldocs
 }
index 0f091fe6412ec6a0d35aa9a748407c69f6e3e32f..fb2e982ebfd855b50b9ae74e7ed3a087b7d345b1 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
        inherit git-r3
@@ -55,11 +55,11 @@ src_configure() {
                -DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
                -DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
        if use doc ; then
                local dirs=(
                        source
@@ -90,7 +90,7 @@ src_test() {
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        use doc && local HTML_DOCS=(doc/.)
        einstalldocs
 }
index ffc8e7dc87437873c5817f7f1acb13d7c5faaa5c..9c27c2d98efa1081e3c72f320d918b39dea27493 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
        inherit git-r3
@@ -52,11 +52,11 @@ src_configure() {
                -DGeant4VMC_BUILD_EXAMPLES="$(usex test)"
                -DGeant4VMC_INSTALL_EXAMPLES="$(usex examples)"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
        if use doc ; then
                local dirs=(
                        source
@@ -83,7 +83,7 @@ src_test() {
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        use doc && local HTML_DOCS=(doc/.)
        einstalldocs
 }
index ccda066630dd933ad0d0be1ffbebbacd2f07bc72..1ef3af47246ff33d568e3304120a05b2c8058356 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
        inherit git-r3
@@ -59,11 +59,11 @@ src_configure() {
        else
                mycmakeargs+=( -DWITH_G4ROOT=no )
        fi
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
        if use doc; then
                cd packages
                doxygen || die
@@ -76,7 +76,7 @@ src_test() {
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        use doc && local HTML_DOCS=( doc/html/. )
        einstalldocs
 }
index 16c08cfb932057c1e7640906f8ae1559633fefb4..66433421fc477d9a0f688b0764c78678e6780f8f 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
        inherit git-r3
@@ -59,11 +59,11 @@ src_configure() {
        else
                mycmakeargs+=( -DWITH_G4ROOT=no )
        fi
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
        if use doc; then
                cd packages
                doxygen || die
@@ -76,7 +76,7 @@ src_test() {
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        use doc && local HTML_DOCS=( doc/html/. )
        einstalldocs
 }
index 8443bf3f67a9f7f949c8dc6257c79d2b5fa03897..675c07b071b1e0b06ba1b5ab4202c683b6ac39e1 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 if [[ ${PV} == *9999* ]]; then
        inherit git-r3
@@ -56,11 +56,11 @@ src_configure() {
        else
                mycmakeargs+=( -DWITH_G4ROOT=no )
        fi
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 src_compile() {
-       cmake-utils_src_compile
+       cmake_src_compile
        if use doc; then
                cd packages
                doxygen || die
@@ -73,7 +73,7 @@ src_test() {
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        use doc && local HTML_DOCS=( doc/html/. )
        einstalldocs
 }
index a1d2016e4d4df563fa542b5ddcd6b941e80ac0be..96a4641a9fb39e330f72af0539da3a8c57c310d3 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils linux-info
+inherit cmake linux-info
 
 DESCRIPTION="Thunderbolt(TM) user-space components"
 HOMEPAGE="https://github.com/intel/thunderbolt-software-user-space"
@@ -30,11 +30,11 @@ pkg_pretend() {
 }
 
 src_prepare() {
-       cmake-utils_src_prepare
+       cmake_src_prepare
        cmake_comment_add_subdirectory docs
 }
 
 src_install() {
-       cmake-utils_src_install
+       cmake_src_install
        doman tbtadm.1
 }
index 7139966cb74680699e74d7825d29f5bf3f7bbc5c..9f5c1deeaa865e60933a80859800e91b98ec605c 100644 (file)
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils gnome2-utils
+inherit cmake gnome2-utils
 
 MY_P=CopyQ-${PV}
 
@@ -46,7 +46,7 @@ src_configure() {
                -DWITH_WEBKIT=$(usex webkit)
                -DCMAKE_INSTALL_MANDIR="share/man"
        )
-       cmake-utils_src_configure
+       cmake_src_configure
 }
 
 pkg_postinst() {
index 90a64046885d5a485ce113ff70c3417533a914c7..15a2ad641c5ed9b3d0b2976812d0dafccab894e9 100644 (file)
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-multilib flag-o-matic multilib systemd
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
 
 if [[ ${PV} == *9999 ]] ; then
        EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
@@ -51,7 +53,7 @@ src_prepare() {
        sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
                server/vglrun.in server/vglgenkey server/vglserver_config || die
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -68,7 +70,7 @@ src_configure() {
                        -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
                        -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
                )
-               cmake-utils_src_configure
+               cmake_src_configure
        }
        multilib_parallel_foreach_abi abi_configure
 }
index baca3aa945323cfdd79de59ec0fc1d76f370d603..b1f2ed56343a09b150c014514e6da1ecfc71f22e 100644 (file)
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-multilib flag-o-matic multilib systemd
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic systemd
 
 if [[ ${PV} == *9999 ]] ; then
        EGIT_REPO_URI="https://github.com/VirtualGL/${PN}.git"
@@ -51,7 +53,7 @@ src_prepare() {
        sed -e "s#/etc/opt#/var/lib#g" -i doc/unixconfig.txt doc/index.html doc/advancedopengl.txt \
                server/vglrun.in server/vglgenkey server/vglserver_config || die
 
-       cmake-utils_src_prepare
+       cmake_src_prepare
 }
 
 src_configure() {
@@ -68,7 +70,7 @@ src_configure() {
                        -DTJPEG_LIBRARY=/usr/$(get_libdir)/libturbojpeg.so
                        -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
                )
-               cmake-utils_src_configure
+               cmake_src_configure
        }
        multilib_parallel_foreach_abi abi_configure
 }