From 2b18f191ccd225ea188e68024d217b5abacb8a20 Mon Sep 17 00:00:00 2001 From: tastytea Date: Sat, 24 Oct 2020 10:40:14 +0200 Subject: [PATCH] =?UTF-8?q?dev-cpp/identiconpp:=20Update=20eclass:=20cmake?= =?UTF-8?q?-utils=20=E2=86=92=20cmake.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dev-cpp/identiconpp/identiconpp-0.7.1.ebuild | 10 +++++----- dev-cpp/identiconpp/identiconpp-9999.ebuild | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-cpp/identiconpp/identiconpp-0.7.1.ebuild b/dev-cpp/identiconpp/identiconpp-0.7.1.ebuild index 6207d14af..b7097f0e5 100644 --- a/dev-cpp/identiconpp/identiconpp-0.7.1.ebuild +++ b/dev-cpp/identiconpp/identiconpp-0.7.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils +inherit cmake if [[ "${PV}" == "9999" ]]; then inherit git-r3 @@ -42,8 +42,6 @@ if [[ "${PV}" != "9999" ]]; then fi src_prepare() { - cmake-utils_src_prepare - if use doc; then HTML_DOCS="doc/html/*" fi @@ -54,10 +52,12 @@ src_prepare() { if use test; then mycmakeargs+=(-DWITH_TESTS=YES) fi + + cmake_src_prepare } src_compile() { - cmake-utils_src_compile + cmake_src_compile if use doc; then ./build_doc.sh @@ -65,5 +65,5 @@ src_compile() { } src_test() { - BUILD_DIR="${BUILD_DIR}/tests" cmake-utils_src_test + BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test } diff --git a/dev-cpp/identiconpp/identiconpp-9999.ebuild b/dev-cpp/identiconpp/identiconpp-9999.ebuild index 6207d14af..b7097f0e5 100644 --- a/dev-cpp/identiconpp/identiconpp-9999.ebuild +++ b/dev-cpp/identiconpp/identiconpp-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit cmake-utils +inherit cmake if [[ "${PV}" == "9999" ]]; then inherit git-r3 @@ -42,8 +42,6 @@ if [[ "${PV}" != "9999" ]]; then fi src_prepare() { - cmake-utils_src_prepare - if use doc; then HTML_DOCS="doc/html/*" fi @@ -54,10 +52,12 @@ src_prepare() { if use test; then mycmakeargs+=(-DWITH_TESTS=YES) fi + + cmake_src_prepare } src_compile() { - cmake-utils_src_compile + cmake_src_compile if use doc; then ./build_doc.sh @@ -65,5 +65,5 @@ src_compile() { } src_test() { - BUILD_DIR="${BUILD_DIR}/tests" cmake-utils_src_test + BUILD_DIR="${BUILD_DIR}/tests" cmake_src_test }