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 0EDB4138350 for ; Thu, 19 Mar 2020 17:57:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FB48E0E77; Thu, 19 Mar 2020 17:57:07 +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 2FD96E0E77 for ; Thu, 19 Mar 2020 17:57:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 1B8A434F0FE for ; Thu, 19 Mar 2020 17:57:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CC0B7106 for ; Thu, 19 Mar 2020 17:57:04 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1584640600.a54a2e6ceb4586e83c02f1cbab697e78f38df203.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libaom/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libaom/libaom-1.0.0-r2.ebuild X-VCS-Directories: media-libs/libaom/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: a54a2e6ceb4586e83c02f1cbab697e78f38df203 X-VCS-Branch: master Date: Thu, 19 Mar 2020 17:57:04 +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: 08978510-e0f7-4010-904c-72c5b9052248 X-Archives-Hash: 35ab6c3115bb5c85cc500da6ebdbc26c commit: a54a2e6ceb4586e83c02f1cbab697e78f38df203 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 19 12:14:29 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 19 17:56:40 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a54a2e6c media-libs/libaom: 1.0.0-r2 EAPI-7 bump, use cmake.eclass Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/libaom/libaom-1.0.0-r2.ebuild | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/media-libs/libaom/libaom-1.0.0-r2.ebuild b/media-libs/libaom/libaom-1.0.0-r2.ebuild index 7ff67cd2f15..f4337dd9e19 100644 --- a/media-libs/libaom/libaom-1.0.0-r2.ebuild +++ b/media-libs/libaom/libaom-1.0.0-r2.ebuild @@ -1,7 +1,9 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + +CMAKE_ECLASS=cmake inherit cmake-multilib if [[ ${PV} == *9999* ]]; then @@ -28,8 +30,12 @@ IUSE="doc examples" IUSE="${IUSE} cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_avx cpu_flags_x86_avx2" IUSE="${IUSE} cpu_flags_arm_neon" -RDEPEND="" -DEPEND="abi_x86_32? ( dev-lang/yasm ) +REQUIRED_USE=" + cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) + cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 ) +" + +BDEPEND="abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm ) abi_x86_x32? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) @@ -37,11 +43,6 @@ DEPEND="abi_x86_32? ( dev-lang/yasm ) doc? ( app-doc/doxygen ) " -REQUIRED_USE=" - cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 ) -" - PATCHES=( "${FILESDIR}/libdirpc2.patch" "${FILESDIR}/pthread_lib2.patch" @@ -55,7 +56,7 @@ DOCS=( PATENTS ) src_prepare() { sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die - cmake-utils_src_prepare + cmake_src_prepare } multilib_src_configure() { @@ -77,17 +78,14 @@ multilib_src_configure() { -DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF) -DENABLE_AVX=$(usex cpu_flags_x86_avx ON OFF) -DENABLE_AVX2=$(usex cpu_flags_x86_avx2 ON OFF) - - -DBUILD_SHARED_LIBS=ON ) - cmake-utils_src_configure + cmake_src_configure rm aom.pc # ensure it is rebuilt with proper libdir } multilib_src_install() { - cmake-utils_src_install if multilib_is_native_abi && use doc ; then - docinto html - dodoc docs/html/* + local HTML_DOCS=( "${BUILD_DIR}"/docs/html/. ) fi + cmake_src_install }