From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ABE841381F3 for ; Sun, 24 May 2020 20:59:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B6673E08FA; Sun, 24 May 2020 20:59:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86DC5E08FA for ; Sun, 24 May 2020 20:59:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C6CF734EF25 for ; Sun, 24 May 2020 20:59:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDFAA26 for ; Sun, 24 May 2020 20:59:24 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1590353958.1c7a7121ba5a02af6fb6c194135dcb7040b97a1c.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/x265/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/x265/x265-3.3.ebuild media-libs/x265/x265-9999.ebuild X-VCS-Directories: media-libs/x265/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 1c7a7121ba5a02af6fb6c194135dcb7040b97a1c X-VCS-Branch: master Date: Sun, 24 May 2020 20:59:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1920152e-92cd-4c13-9418-0940b03da72e X-Archives-Hash: 217f2d9d87622c50e6f7dd2bce05cd40 commit: 1c7a7121ba5a02af6fb6c194135dcb7040b97a1c Author: Thomas Deutschmann gentoo org> AuthorDate: Sun May 24 20:59:02 2020 +0000 Commit: Thomas Deutschmann gentoo 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 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() {