[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

[Thomas Deutschmann]

commit:     1c7a7121ba5a02af6fb6c194135dcb7040b97a1c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 20:59:02 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun May 24 20:59:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c7a7121

media-libs/x265: switch to cmake-multilib eclass

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 media-libs/x265/x265-3.3.ebuild  | 9 +++++----
 media-libs/x265/x265-9999.ebuild | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/media-libs/x265/x265-3.3.ebuild b/media-libs/x265/x265-3.3.ebuild
index 9428b001e84..96fa1f5e454 100644
--- a/media-libs/x265/x265-3.3.ebuild
+++ b/media-libs/x265/x265-3.3.ebuild
@@ -3,7 +3,8 @@
 
 EAPI="7"
 
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+CMAKE_ECLASS=cmake
+inherit flag-o-matic multibuild cmake-multilib
 
 if [[ ${PV} = 9999* ]]; then
        inherit mercurial
@@ -117,7 +118,7 @@ x265_variant_src_configure() {
                        die "Unknown variant: ${MULTIBUILD_VARIANT}";;
        esac
 
-       cmake-utils_src_configure
+       cmake_src_configure
        popd >/dev/null || die
 }
 
@@ -173,7 +174,7 @@ multilib_src_configure() {
 
 multilib_src_compile() {
        local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-       multibuild_foreach_variant cmake-utils_src_compile
+       multibuild_foreach_variant cmake_src_compile
 }
 
 x265_variant_src_test() {
@@ -194,7 +195,7 @@ multilib_src_test() {
 multilib_src_install() {
        # Install only "main" variant since the others are already linked into 
it.
        local MULTIBUILD_VARIANTS=( "main" )
-       multibuild_foreach_variant cmake-utils_src_install
+       multibuild_foreach_variant cmake_src_install
 }
 
 multilib_src_install_all() {

diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 9428b001e84..96fa1f5e454 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -3,7 +3,8 @@
 
 EAPI="7"
 
-inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+CMAKE_ECLASS=cmake
+inherit flag-o-matic multibuild cmake-multilib
 
 if [[ ${PV} = 9999* ]]; then
        inherit mercurial
@@ -117,7 +118,7 @@ x265_variant_src_configure() {
                        die "Unknown variant: ${MULTIBUILD_VARIANT}";;
        esac
 
-       cmake-utils_src_configure
+       cmake_src_configure
        popd >/dev/null || die
 }
 
@@ -173,7 +174,7 @@ multilib_src_configure() {
 
 multilib_src_compile() {
        local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
-       multibuild_foreach_variant cmake-utils_src_compile
+       multibuild_foreach_variant cmake_src_compile
 }
 
 x265_variant_src_test() {
@@ -194,7 +195,7 @@ multilib_src_test() {
 multilib_src_install() {
        # Install only "main" variant since the others are already linked into 
it.
        local MULTIBUILD_VARIANTS=( "main" )
-       multibuild_foreach_variant cmake-utils_src_install
+       multibuild_foreach_variant cmake_src_install
 }
 
 multilib_src_install_all() {