[gentoo-commits] repo/gentoo:master commit in: media-libs/kvazaar/

["Craig Andrews" <candrews@gentoo.org>]

commit:     d62c635158deae0918d32b476800b28f17d8d0f2
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 26 19:16:18 2018 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Dec  4 14:07:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d62c6351

media-libs/kvazaar: EAPI=7, test deps, fix tests

Bug: https://bugs.gentoo.org/671146
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 .../kvazaar/{kvazaar-9999.ebuild => kvazaar-1.2.0-r1.ebuild}  | 11 ++++++++++-
 media-libs/kvazaar/kvazaar-9999.ebuild                        | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
similarity index 81%
copy from media-libs/kvazaar/kvazaar-9999.ebuild
copy to media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
index 48ce175d048..b8685352e22 100644
--- a/media-libs/kvazaar/kvazaar-9999.ebuild
+++ b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 GREATEST_PV="1.2.1"
 
@@ -24,9 +24,13 @@ SLOT="0/4"
 IUSE="static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
+RESTRICT="!test? ( test )"
 ASM_DEP=">=dev-lang/yasm-1.2.0"
 RDEPEND=""
 DEPEND="${RDEPEND}
+	test? (
+		media-video/ffmpeg
+	)
 	abi_x86_32? ( ${ASM_DEP} )
 	abi_x86_64? ( ${ASM_DEP} )
 "
@@ -42,6 +46,11 @@ src_prepare() {
 	fi
 	# Some m4 macros append Werror, we do not want that.
 	append-flags "-Wno-error"
+
+	# valgrind isn't available on all archs
+	# also, the valgrind tests fail with new ffmpeg (upstream only tests again ffmpeg 2.6.3)
+	# see https://github.com/ultravideo/kvazaar/issues/216
+	find "${S}/tests/" -type f -exec grep -q 'valgrind_test' '{}' \; -delete || die
 }
 
 multilib_src_configure() {

diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild
index 48ce175d048..b8685352e22 100644
--- a/media-libs/kvazaar/kvazaar-9999.ebuild
+++ b/media-libs/kvazaar/kvazaar-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 GREATEST_PV="1.2.1"
 
@@ -24,9 +24,13 @@ SLOT="0/4"
 IUSE="static-libs test"
 REQUIRED_USE="test? ( static-libs )"
 
+RESTRICT="!test? ( test )"
 ASM_DEP=">=dev-lang/yasm-1.2.0"
 RDEPEND=""
 DEPEND="${RDEPEND}
+	test? (
+		media-video/ffmpeg
+	)
 	abi_x86_32? ( ${ASM_DEP} )
 	abi_x86_64? ( ${ASM_DEP} )
 "
@@ -42,6 +46,11 @@ src_prepare() {
 	fi
 	# Some m4 macros append Werror, we do not want that.
 	append-flags "-Wno-error"
+
+	# valgrind isn't available on all archs
+	# also, the valgrind tests fail with new ffmpeg (upstream only tests again ffmpeg 2.6.3)
+	# see https://github.com/ultravideo/kvazaar/issues/216
+	find "${S}/tests/" -type f -exec grep -q 'valgrind_test' '{}' \; -delete || die
 }
 
 multilib_src_configure() {