gentoo resync : 20.02.2019

3 files changed, 12 insertions, 107 deletions

diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 6429bdad3736..43cac3f5e008 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -4,6 +4,5 @@ AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e
 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-r1.ebuild 2466 BLAKE2B 5ed688c58047191f2bce0c78b8edb0875eee61abc6014c4a6aba8cbb3ed9e3912b40b29db24a200a5c7570e36cde4e0b4f3ffe64a779004601be23ccdf38ba9a SHA512 43b7859a4beb1d3db5524d3d1fa831499199a8a6ffd344ee19409dfe632b73e661bfe44bb8256c77ded089467ea24a8f1b7d5ad4e522d863925b5f287abf8295
-EBUILD libaom-1.0.0.ebuild 2383 BLAKE2B 6974b5229b63d0960b99f95f74c4c59fc927d54864a8f61776b647119de2cbba586de0d370a173569b78b00ea6cb212a66ec05293b8850e4bcc605bdf48e486d SHA512 e583e80d48afeee67d889a5fec76a850f7554937d480159f9746378ba2b94f8553735431fd874dccb75fe7c9c4e03e716716a4c7c4887c6c57871eb75ba24508
-EBUILD libaom-9999.ebuild 2373 BLAKE2B 6ff9a52b932ea269cc2b3a81f13c5826b900f4f0d88b0e30f3d0b2ea71245076ace4eee21611cc709caac4ca7adeb4e4c87cdbc3e1610a24cc386b18227349bd SHA512 665b627406b26f0d21b955cc36939d2c38231fe17a16f9567a3dc5311bdc567cf744b0fc7d0b1447e640ada532738e8aa7910add47161db68f0e457f86dbcda5
+EBUILD libaom-9999.ebuild 2110 BLAKE2B fc0aabd237735452c5218edccfdfd723808d67877025d20e344fc13e567f8705bd48a97316d641b056578a4d70fca8ece459a3fad684febca2198f27f8644d9b SHA512 401a82d1cc0ec2ca9086edb0203d3e9c39dc995241bccbc546b322bb0ad6da8af2a01101d7ceed32b381b3ad175bc7bc616f3fbec17c28eb1cda99d2fb7cde2e
 MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-1.0.0.ebuild b/media-libs/libaom/libaom-1.0.0.ebuild
deleted file mode 100644
index 5cb116ecb388..000000000000
--- a/media-libs/libaom/libaom-1.0.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
-else
-	if [[ ${PV} == *pre* ]]; then
-		SRC_URI="mirror://gentoo/${P}.tar.xz"
-		S="${WORKDIR}/${PN}"
-	else
-		# SRC_URI="https://aomedia.googlesource.com/aom/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
-		SRC_URI="mirror://gentoo/${P}.tar.gz"
-		S="${WORKDIR}"
-	fi
-	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
-HOMEPAGE="https://aomedia.org"
-
-LICENSE="BSD-2"
-SLOT="0/0"
-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 )
-	abi_x86_64? ( dev-lang/yasm )
-	abi_x86_x32? ( dev-lang/yasm )
-	x86-fbsd? ( dev-lang/yasm )
-	amd64-fbsd? ( 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" )
-
-src_prepare() {
-	sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DENABLE_DOCS=$(multilib_native_usex doc ON OFF)
-		-DENABLE_EXAMPLES=$(multilib_native_usex examples ON OFF)
-		-DENABLE_NASM=OFF
-		-DENABLE_TOOLS=ON
-		-DENABLE_WERROR=OFF
-
-		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DENABLE_NEON_ASM=$(usex cpu_flags_arm_neon ON OFF)
-		# ENABLE_DSPR2 / ENABLE_MSA for mips
-		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
-		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
-		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)
-		-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)
-		-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)
-		-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
-	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/*
-	fi
-}
diff --git a/media-libs/libaom/libaom-9999.ebuild b/media-libs/libaom/libaom-9999.ebuild
index e0f9c64ac4f3..3dbea1ddc955 100644
--- a/media-libs/libaom/libaom-9999.ebuild
+++ b/media-libs/libaom/libaom-9999.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit cmake-multilib
 
 if [[ ${PV} == *9999* ]]; then
@@ -28,8 +29,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,17 +42,7 @@ 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" )
-
-src_prepare() {
-	sed -e 's/lib"/lib${LIB_SUFFIX}"/' -i CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
+PATCHES=( "${FILESDIR}/pthread_lib2.patch" )
 
 multilib_src_configure() {
 	local mycmakeargs=(
@@ -58,7 +53,6 @@ multilib_src_configure() {
 		-DENABLE_WERROR=OFF
 
 		-DENABLE_NEON=$(usex cpu_flags_arm_neon ON OFF)
-		-DENABLE_NEON_ASM=$(usex cpu_flags_arm_neon ON OFF)
 		# ENABLE_DSPR2 / ENABLE_MSA for mips
 		-DENABLE_MMX=$(usex cpu_flags_x86_mmx ON OFF)
 		-DENABLE_SSE=$(usex cpu_flags_x86_sse ON OFF)
@@ -68,17 +62,13 @@ 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
-	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-utils_src_install
 }