diff options
| -rw-r--r-- | dev-util/cmocka/cmocka-1.1.5.ebuild | 11 | ||||
| -rw-r--r-- | media-gfx/exiv2/exiv2-0.27.2.ebuild | 7 | ||||
| -rw-r--r-- | media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild | 5 | ||||
| -rw-r--r-- | net-libs/libssh/libssh-0.9.0.ebuild | 11 | ||||
| -rw-r--r-- | net-libs/libssh/libssh-0.9.3.ebuild | 11 | ||||
| -rw-r--r-- | net-libs/libssh/libssh-9999.ebuild | 11 | ||||
| -rw-r--r-- | x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild | 3 | ||||
| -rw-r--r-- | x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild | 3 |
8 files changed, 35 insertions, 27 deletions
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild index eecc4f26cc8c..1d03a7176914 100644 --- a/dev-util/cmocka/cmocka-1.1.5.ebuild +++ b/dev-util/cmocka/cmocka-1.1.5.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_ECLASS=cmake inherit cmake-multilib DESCRIPTION="Unit testing framework for C" @@ -24,16 +25,16 @@ multilib_src_configure() { -DWITH_EXAMPLES=$(usex examples) -DWITH_STATIC_LIB=$(usex static-libs) -DUNIT_TESTING=$(usex test) - $(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \ + $(multilib_is_native_abi && cmake_use_find_package doc Doxygen \ || echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON) ) - cmake-utils_src_configure + cmake_src_configure } multilib_src_compile() { - cmake-utils_src_compile - multilib_is_native_abi && use doc && cmake-utils_src_compile docs + cmake_src_compile + multilib_is_native_abi && use doc && cmake_src_compile docs } multilib_src_install() { @@ -41,5 +42,5 @@ multilib_src_install() { local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) fi - cmake-utils_src_install + cmake_src_install } diff --git a/media-gfx/exiv2/exiv2-0.27.2.ebuild b/media-gfx/exiv2/exiv2-0.27.2.ebuild index 3d6060c5535e..b1ac0f0a6b3d 100644 --- a/media-gfx/exiv2/exiv2-0.27.2.ebuild +++ b/media-gfx/exiv2/exiv2-0.27.2.ebuild @@ -11,6 +11,7 @@ else KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" fi +CMAKE_ECLASS=cmake PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) inherit cmake-multilib python-any-r1 @@ -59,7 +60,7 @@ src_prepare() { iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die mv -f doc/cmd.txt.tmp doc/cmd.txt || die - cmake-utils_src_prepare + cmake_src_prepare sed -e "/^include.*compilerFlags/s/^/#DONT /" -i CMakeLists.txt || die } @@ -79,11 +80,11 @@ multilib_src_configure() { -DCMAKE_INSTALL_DOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html ) - cmake-utils_src_configure + cmake_src_configure } multilib_src_compile() { - cmake-utils_src_compile + cmake_src_compile if multilib_is_native_abi; then use doc && eninja doc diff --git a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild index 5cac4484ce05..f6f6fbf93eb2 100644 --- a/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild +++ b/media-libs/taglib/taglib-1.11.1_p20190920-r1.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_ECLASS=cmake COMMIT=54508df30bc888c4d2359576ceb0cc8f2fa8dbdf inherit cmake-multilib @@ -35,7 +36,7 @@ MULTILIB_CHOST_TOOLS=( S="${WORKDIR}/${PN}-${COMMIT}" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare sed -e "s/BUILD_TESTS AND NOT BUILD_SHARED_LIBS/BUILD_TESTS/" \ -i CMakeLists.txt \ @@ -48,5 +49,5 @@ multilib_src_configure() { -DBUILD_TESTS=$(usex test) ) - cmake-utils_src_configure + cmake_src_configure } diff --git a/net-libs/libssh/libssh-0.9.0.ebuild b/net-libs/libssh/libssh-0.9.0.ebuild index b13f672c4840..759da6a2fc09 100644 --- a/net-libs/libssh/libssh-0.9.0.ebuild +++ b/net-libs/libssh/libssh-0.9.0.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_ECLASS=cmake inherit cmake-multilib DESCRIPTION="Access a working SSH implementation by means of a library" @@ -49,7 +50,7 @@ PATCHES=( ) src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # just install the examples, do not compile them cmake_comment_add_subdirectory examples @@ -88,16 +89,16 @@ multilib_src_configure() { multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) - cmake-utils_src_configure + cmake_src_configure } multilib_src_compile() { - cmake-utils_src_compile - multilib_is_native_abi && use doc && cmake-utils_src_compile docs + cmake_src_compile + multilib_is_native_abi && use doc && cmake_src_compile docs } multilib_src_install() { - cmake-utils_src_install + cmake_src_install multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) # compatibility symlink until all consumers have been updated diff --git a/net-libs/libssh/libssh-0.9.3.ebuild b/net-libs/libssh/libssh-0.9.3.ebuild index 3ead343c58fe..c015fb647b0e 100644 --- a/net-libs/libssh/libssh-0.9.3.ebuild +++ b/net-libs/libssh/libssh-0.9.3.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_ECLASS=cmake inherit cmake-multilib DESCRIPTION="Access a working SSH implementation by means of a library" @@ -49,7 +50,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) RESTRICT+=" !test? ( test )" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # just install the examples, do not compile them cmake_comment_add_subdirectory examples @@ -88,16 +89,16 @@ multilib_src_configure() { multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) - cmake-utils_src_configure + cmake_src_configure } multilib_src_compile() { - cmake-utils_src_compile - multilib_is_native_abi && use doc && cmake-utils_src_compile docs + cmake_src_compile + multilib_is_native_abi && use doc && cmake_src_compile docs } multilib_src_install() { - cmake-utils_src_install + cmake_src_install multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) use static-libs && dolib.a src/libssh.a diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild index e86e51662ed2..8ddb3caa00db 100644 --- a/net-libs/libssh/libssh-9999.ebuild +++ b/net-libs/libssh/libssh-9999.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_ECLASS=cmake inherit cmake-multilib DESCRIPTION="Access a working SSH implementation by means of a library" @@ -49,7 +50,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.8.0-tests.patch" ) RESTRICT+=" !test? ( test )" src_prepare() { - cmake-utils_src_prepare + cmake_src_prepare # just install the examples, do not compile them cmake_comment_add_subdirectory examples @@ -88,16 +89,16 @@ multilib_src_configure() { multilib_is_native_abi || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON ) - cmake-utils_src_configure + cmake_src_configure } multilib_src_compile() { - cmake-utils_src_compile - multilib_is_native_abi && use doc && cmake-utils_src_compile docs + cmake_src_compile + multilib_is_native_abi && use doc && cmake_src_compile docs } multilib_src_install() { - cmake-utils_src_install + cmake_src_install multilib_is_native_abi && use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) use static-libs && dolib.a src/libssh.a diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild index 803e8e61400a..8f1e41d55b76 100644 --- a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild +++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.1-r1.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_ECLASS=cmake MY_PN=${PN}3 MY_P=${MY_PN}-${PV} inherit cmake-multilib @@ -44,7 +45,7 @@ multilib_src_configure() { -DENABLE_DEMO=OFF ) fi - cmake-utils_src_configure + cmake_src_configure } src_install() { diff --git a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild index 9b9e4ced8f7f..deac2e20f0e3 100644 --- a/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild +++ b/x11-themes/oxygen-gtk/oxygen-gtk-1.4.6-r1.ebuild @@ -3,6 +3,7 @@ EAPI=7 +CMAKE_ECLASS=cmake MY_PN=${PN}2 MY_P=${MY_PN}-${PV} inherit cmake-multilib @@ -47,7 +48,7 @@ multilib_src_configure() { -DENABLE_DEMO=OFF ) fi - cmake-utils_src_configure + cmake_src_configure } src_install() { |