From dc2d05cd3f322a8baa0aed7d4c2b48e9e7e670f4 Mon Sep 17 00:00:00 2001
From: Gediminas Jakutis <gediminas@varciai.lt>
Date: Thu, 13 Feb 2020 17:56:46 +0200
Subject: libvpx: update ebuild.

Signed-off-by: Gediminas Jakutis <gediminas@varciai.lt>
---
 media-libs/libvpx/libvpx-9999.ebuild | 40 +++++++++++-------------------------
 1 file changed, 12 insertions(+), 28 deletions(-)

(limited to 'media-libs/libvpx')

diff --git a/media-libs/libvpx/libvpx-9999.ebuild b/media-libs/libvpx/libvpx-9999.ebuild
index 39e61a8..af163a9 100644
--- a/media-libs/libvpx/libvpx-9999.ebuild
+++ b/media-libs/libvpx/libvpx-9999.ebuild
@@ -1,31 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 inherit toolchain-funcs git-r3 multilib-minimal
 
-# To create a new testdata tarball:
-# 1. Unpack source tarbll or checkout git tag
-# 2. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
-# 3. configure --enable-unit-tests --enable-vp9-highbitdepth
-# 4. make testdata
-# 5. tar -cjf libvpx-testdata-${PV}.tar.bz2 libvpx-testdata
-
-LIBVPX_TESTDATA_VER=1.8.0
-
 DESCRIPTION="WebM VP8 and VP9 Codec SDK"
-HOMEPAGE="http://www.webmproject.org"
+HOMEPAGE="https://www.webmproject.org"
 EGIT_REPO_URI="https://chromium.googlesource.com/webm/libvpx https://github.com/webmproject/libvpx.git"
 
 LICENSE="BSD"
 SLOT="0/6"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc +highbitdepth postproc static-libs test +threads"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc +highbitdepth postproc static-libs svc +threads"
 
-REQUIRED_USE="test? ( threads )"
-
-# Disable test phase when USE="-test"
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 RDEPEND=""
 DEPEND="abi_x86_32? ( dev-lang/yasm )
@@ -52,14 +40,6 @@ src_configure() {
 multilib_src_configure() {
 	unset CODECS #357487
 
-	local myconf
-	if multilib_is_native_abi; then
-		myconf+=" $(use_enable doc install-docs) $(use_enable doc docs)"
-	else
-		# not needed for multilib and will be overwritten anyway.
-		myconf+=" --disable-examples --disable-install-docs --disable-docs"
-	fi
-
 	# #498364: sse doesn't work without sse2 enabled,
 	local myconfargs=(
 		--prefix="${EPREFIX}"/usr
@@ -72,11 +52,8 @@ multilib_src_configure() {
 		$(use_enable postproc)
 		$(use_enable svc experimental)
 		$(use_enable static-libs static)
-		$(use_enable test unit-tests)
 		$(use_enable threads multithread)
 		$(use_enable highbitdepth vp9-highbitdepth)
-		$(use_enable doc install-docs)
-		$(use_enable doc docs)
 	)
 
 	# let the build system decide which AS to use (it honours $AS but
@@ -92,6 +69,13 @@ multilib_src_configure() {
 	# Link with gcc by default, the build system should override this if needed.
 	export LD="${CC}"
 
+	if multilib_is_native_abi; then
+		myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
+	else
+		# not needed for multilib and will be overwritten anyway.
+		myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
+	fi
+
 	echo "${S}"/configure "${myconfargs[@]}" >&2
 	"${S}"/configure "${myconfargs[@]}"
 }
-- 
cgit v1.2.3