gentoo Easter resync : 12.04.2020

3 files changed, 21 insertions, 20 deletions

diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index cc0c8454490e..36581a4ed7a3 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -4,6 +4,6 @@ AUX libaom-1.0.0-version.patch 403 BLAKE2B 8ab115aecb2251750f964bafea7e74ea8e4ed
 AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e01a38c97b0398141202d7cab0a8d9b69b037ad8ba0b7d5e293bda3e2c491906ac6dd9555f7d4631ec SHA512 ec47d5b026c4b687649a2ce46500376103ae3fef21cba2cb564771c3738dba4e61e51858875516f884ab4604b0c160e6ee07b98e6740643e18f596c624df1ccb
 AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
 DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
-EBUILD libaom-1.0.0-r2.ebuild 2604 BLAKE2B 7e752845aeafaa83b1e8e1554701b0618db332b2ffa397019b2e306828d1bd01623c6055d49712e207b9b31a258af2a8be10790baae22af67d82e2eb83be28ba SHA512 326dfa9c8ab99bd9daaadd6a174672bf9587fe5c7feed5b5d06a6acc8c7f701da4faec47e369bca8a0cb3296c363cee96c1c73930dcf3ce4c7fc22d5162d3026
-EBUILD libaom-9999.ebuild 2124 BLAKE2B c3b3d2ffed644cbfd40c692d13b3a52cf8f51454283846aa56d81e95507d04517f0aed83763c1d1b326923847452096fac2cbe1d94bdb9f1bf885f2dec636b5a SHA512 cc64a48074bf750d8fdd3d9c035e80c0a776bf21173b8a20a9d0f025cd638149d139a7ff3a3a6c73f92bc59ee53e99de483722627da83130ed0ebcb55342ad37
+EBUILD libaom-1.0.0-r2.ebuild 2585 BLAKE2B 6be258a02782560bf5fd8ac982e710a90f51abf4bf6565a7ae59b1531d560e064e6a3333cd6021cfa75e07db58e82c1d23d98e2bea84d89eadc80ab57f62e7b9 SHA512 6b834f4de8a1173c76ca3e4231ccb15c38f6a29669129865cbb8da6aa182a51a9673b965d57ddf876a6a32cc8a9e336d920dfa1208955089e2bcd706b256cdd5
+EBUILD libaom-9999.ebuild 2245 BLAKE2B ad771b20662c0d994ad6312a02248091f564c9a8277320ea6776df46d46630df63b9fb8b144cc1b4e9051c4c8fa76d3a819457896af4eaff7ad20fc8112f36ed SHA512 f4f288d79d8f493790790254436acd87937e6bf3d22cb4c050f759fdeedfe711a0792654831dbfe701f8389234757afbc385d686dee4325edd08a3a825e3bda7
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-1.0.0-r2.ebuild b/media-libs/libaom/libaom-1.0.0-r2.ebuild
index 7ff67cd2f15e..3565b7b17727 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
@@ -16,7 +18,7 @@ else
 		SRC_URI="mirror://gentoo/${P}.tar.gz"
 		S="${WORKDIR}"
 	fi
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
@@ -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
 }
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index 53bc9ffd6e14..22ed36836856 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ else
 		SRC_URI="mirror://gentoo/${P}.tar.gz"
 		S="${WORKDIR}"
 	fi
-	KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
@@ -45,6 +45,9 @@ BDEPEND="abi_x86_32? ( dev-lang/yasm )
 
 PATCHES=( "${FILESDIR}/pthread_lib2.patch" )
 
+# the PATENTS file is required to be distributed with this package bug #682214
+DOCS=( PATENTS )
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)