gentoo resync : 02.09.2020

3 files changed, 69 insertions, 3 deletions

diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index db44442f3f2f..566310ee0264 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -1,5 +1,7 @@
 DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f192cf4b62ef3f0443a3e10fee71f4283f836931fee52672f2b37398f86046ae97220c2b6c6045fec9f9bf5cda8 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211
 DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
+DIST kvazaar-2.0.0.tar.gz 589661 BLAKE2B 253085784bb3481b578206d5a406d0c25c002905f420337939489d01604f7b5f4ee13a17e596ce96e5d577c508f93f72d2befa5851ab95d7ba9db2030de02550 SHA512 9b2564643f4470d59160f7addffbc6b9e22c0d8bd04dbcd77705aa7263dfdc0195a8642255c45b94049b88ba9cbf4ffd49f968d766e31bc404c612b8f18bdbca
 EBUILD kvazaar-1.2.0-r1.ebuild 1834 BLAKE2B 80e47155391be5fccd67ccde5f2ab8865a23ef63b03e4d4695314f27cde4e4b613637b646831ff0c0b4166b8dd623ca0a846bf256c899936d31f45bbde7c431a SHA512 f8b0b8842293e298092852c9ffdadaf34263a850c5f7a170f52ef8af8f514a0b87a65a317f4580e97ae358e9cd8c2399f3b2c9e9b4807c418bf8ef029637d9dc
-EBUILD kvazaar-9999.ebuild 1841 BLAKE2B 44b64fd8a475178738c85b5289a04b47a28772a89430c35f928548454967eeb3b4fb07bf14d1e0f9326c75f1ae04e70be4f036c0ad21bc896f2518f26e06d773 SHA512 a1735b9cb301c8a7e6dc5acc07ccbe4ba4c93b6f32799d085699c7a260bbb77b917cd890e37296f895352b0fa7fe3b70214c201feb1bbbb8dad016d63c8a8a75
+EBUILD kvazaar-2.0.0.ebuild 1841 BLAKE2B 8c301cc10d60875ccee438af2a7e663a81f6facaa1d456b5b316758ddd3e0f4e75cb22e3a3b11d27c9483e70ea116aff6ef7ef6eed83b4b37d19b5162a2f90d8 SHA512 a95bdb2ef91e1d50ee24734200edcb09aefc008dec2a3c7bf1c8f483511a169abf49efd052bccf9963042ad0049b5baa3b372555f1e7b2dcad72aa70ab6928f7
+EBUILD kvazaar-9999.ebuild 1841 BLAKE2B 8c301cc10d60875ccee438af2a7e663a81f6facaa1d456b5b316758ddd3e0f4e75cb22e3a3b11d27c9483e70ea116aff6ef7ef6eed83b4b37d19b5162a2f90d8 SHA512 a95bdb2ef91e1d50ee24734200edcb09aefc008dec2a3c7bf1c8f483511a169abf49efd052bccf9963042ad0049b5baa3b372555f1e7b2dcad72aa70ab6928f7
 MISC metadata.xml 306 BLAKE2B 9556e4fbc08c1634b447aa9ebbc78c7b8b55a088e71db8cb7ada5c45645a2ea809f50b956a2b3b54dc1493a59861e9f4c405405edc00a49991e543125017f32b SHA512 8210924e0f6d879f473b353a9806e95ec136ceaef507b1911162c7d2bfbbc4e072f9e59ac105af2771b64ba625f3b4f922b60bba7072d1d87a079c221511d927
diff --git a/media-libs/kvazaar/kvazaar-2.0.0.ebuild b/media-libs/kvazaar/kvazaar-2.0.0.ebuild
new file mode 100644
index 000000000000..f0ff4dca3520
--- /dev/null
+++ b/media-libs/kvazaar/kvazaar-2.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GREATEST_PV="1.2.1"
+
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
+else
+	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Open-source HEVC encoder"
+HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
+
+LICENSE="LGPL-2.1"
+# subslot = libkvazaar major
+SLOT="0/6"
+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} )
+"
+
+src_prepare() {
+	default
+	sed -e "/^dist_doc_DATA/s/COPYING //" -i Makefile.am || die
+	eautoreconf
+	if use test && [[ ${PV} != *9999 ]]; then
+		# https://bugs.gentoo.org/show_bug.cgi?id=595932
+		rmdir "${S}/greatest" || die
+		mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die
+	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() {
+	ECONF_SOURCE="${S}" econf \
+		--disable-werror \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild
index b8685352e221..f0ff4dca3520 100644
--- a/media-libs/kvazaar/kvazaar-9999.ebuild
+++ b/media-libs/kvazaar/kvazaar-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,7 @@ HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
 
 LICENSE="LGPL-2.1"
 # subslot = libkvazaar major
-SLOT="0/4"
+SLOT="0/6"
 IUSE="static-libs test"
 REQUIRED_USE="test? ( static-libs )"