gentoo resync : 24.12.2018

5 files changed, 124 insertions, 62 deletions

diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index f192352074f7..d942fb17fe2e 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -3,6 +3,7 @@ DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f1
 DIST kvazaar-1.1.0.tar.gz 484601 BLAKE2B fc35fe5bbd12779d4e14b8cef6fbc6950f188ccffef567c77411bf32f80f2e355f235ad9df4762f8a615415778b322715d09d21a910a256d1bb2054bc13dbdb2 SHA512 72cee44e32c76c0a94acf33347457145d3f88d644fb4703588d0db6bff1c7064c9b623034efe4ba39219150767012544e4f45141b6a6183d41e4a29c6cb258b9
 DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
 EBUILD kvazaar-1.1.0.ebuild 1512 BLAKE2B 4f8f062035d7fb2fb5ecaafa6e76cfc7fae234cabd9cb572db8cb13c7fa505d6b46b8899656d35574af17f15e81bcf051f8d18e1be0faa12b1891209592e3ba5 SHA512 0f973ad261941f971e12a93dff71f9af57083657dbe666245cd11a004041f889d829e6a6af9a83b6ac176e7a285dfcd29fd41eb09eca6d6e2c0de6426ec2420e
-EBUILD kvazaar-1.2.0.ebuild 1582 BLAKE2B ea2ffc2aa7e1638e5131af9b908dfb52c6fd8fbcef50cfcb3383e8f94097f17c082c44989ed6a2d4a1c1d78f9ae4ad735709d8856f06c835295ab2944ed272ac SHA512 02132db61e2af2e095f4a0f77558518fecaf4e4da910f7ddc5de2a2195f4d0270bfa7019b1912be0f7982c2cb61b06ef9b07d72ab2a106f738927a447a4ff459
-EBUILD kvazaar-9999.ebuild 1575 BLAKE2B 94a121eda6db1010030dfd331eaae047fdc068f0e5fbbd387b54ac506f915b83ddb9f896843ef46b68e6305754e0334b744c5784886e778e8d15aeaa1b08e191 SHA512 4b67098e1a756008a83c645972392b0ea8cf102274b5f95fcc083ed6f11818d0ad1b5fe2401d9240a253c9bffd2679b16b142b3c32f459f79f7f64e8c55258f5
-MISC metadata.xml 314 BLAKE2B 59244096c1566e9c0ea7eb52c8eb8eb63cc188febd8c1fba49006c31185669340c7f8d83e9b5d745dde96b43abefdb117c2c7d3b3c9177174aaf796b5f4ab9fb SHA512 3cf0527dc69a26ad9b7f33b2d5df536712fb19df9bac7cc0f067eac31d2b420ddf22dd744d643bf053caf27615f133478c1fd0d601e553546e73a0bd5e5897f2
+EBUILD kvazaar-1.2.0-r1.ebuild 1841 BLAKE2B 44b64fd8a475178738c85b5289a04b47a28772a89430c35f928548454967eeb3b4fb07bf14d1e0f9326c75f1ae04e70be4f036c0ad21bc896f2518f26e06d773 SHA512 a1735b9cb301c8a7e6dc5acc07ccbe4ba4c93b6f32799d085699c7a260bbb77b917cd890e37296f895352b0fa7fe3b70214c201feb1bbbb8dad016d63c8a8a75
+EBUILD kvazaar-1.2.0.ebuild 1512 BLAKE2B 2796d4ddea69e3cf86892691aae9d908855b56a8149bf1684df9ffcd79a91fb00fc1db4c256dd1979255ef583eecbb948d3bf41dd936a95a39f4cfb8f929469a SHA512 f9acf71e411c915d7ef5192a49d0cf54e3a170a1f67e8aefd547e95f376e9465133959aa263a56bffd76aa45f38dfffdf3bcc8a3672fbd424d29f652295fae0a
+EBUILD kvazaar-9999.ebuild 1841 BLAKE2B 44b64fd8a475178738c85b5289a04b47a28772a89430c35f928548454967eeb3b4fb07bf14d1e0f9326c75f1ae04e70be4f036c0ad21bc896f2518f26e06d773 SHA512 a1735b9cb301c8a7e6dc5acc07ccbe4ba4c93b6f32799d085699c7a260bbb77b917cd890e37296f895352b0fa7fe3b70214c201feb1bbbb8dad016d63c8a8a75
+MISC metadata.xml 306 BLAKE2B 9556e4fbc08c1634b447aa9ebbc78c7b8b55a088e71db8cb7ada5c45645a2ea809f50b956a2b3b54dc1493a59861e9f4c405405edc00a49991e543125017f32b SHA512 8210924e0f6d879f473b353a9806e95ec136ceaef507b1911162c7d2bfbbc4e072f9e59ac105af2771b64ba625f3b4f922b60bba7072d1d87a079c221511d927
diff --git a/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..b8685352e221
--- /dev/null
+++ b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 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/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} )
+"
+
+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-1.2.0.ebuild b/media-libs/kvazaar/kvazaar-1.2.0.ebuild
index 3c2dc94003a5..48ce175d0487 100644
--- a/media-libs/kvazaar/kvazaar-1.2.0.ebuild
+++ b/media-libs/kvazaar/kvazaar-1.2.0.ebuild
@@ -1,45 +1,41 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-SCM=""
+EAPI=6
 
 GREATEST_PV="1.2.1"
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
-fi
-
-inherit eutils multilib autotools multilib-minimal toolchain-funcs flag-o-matic ${SCM}
-
-DESCRIPTION="An open-source HEVC encoder"
-HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
-
-if [ "${PV#9999}" = "${PV}" ] ; then
+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/4"
 IUSE="static-libs test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
 REQUIRED_USE="test? ( static-libs )"
 
 ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${DEPEND}
+RDEPEND=""
+DEPEND="${RDEPEND}
 	abi_x86_32? ( ${ASM_DEP} )
-	abi_x86_64? ( ${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}" = "${PV}" ]; then
+	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
@@ -49,13 +45,11 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-		econf \
-			--disable-werror \
-			--docdir "/usr/share/doc/${PF}" \
-			$(use_enable static-libs static)
+	ECONF_SOURCE="${S}" econf \
+		--disable-werror \
+		$(use_enable static-libs static)
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild
index 17d2a2b7ecaf..b8685352e221 100644
--- a/media-libs/kvazaar/kvazaar-9999.ebuild
+++ b/media-libs/kvazaar/kvazaar-9999.ebuild
@@ -1,61 +1,64 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-SCM=""
+EAPI=7
 
 GREATEST_PV="1.2.1"
 
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
+if [[ ${PV} = *9999 ]] ; then
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
-fi
-
-inherit eutils multilib autotools multilib-minimal toolchain-funcs flag-o-matic ${SCM}
-
-DESCRIPTION="An open-source HEVC encoder"
-HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
-
-if [ "${PV#9999}" = "${PV}" ] ; then
+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 ~x86"
+	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/4"
 IUSE="static-libs test"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
 REQUIRED_USE="test? ( static-libs )"
 
+RESTRICT="!test? ( test )"
 ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="${DEPEND}
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		media-video/ffmpeg
+	)
 	abi_x86_32? ( ${ASM_DEP} )
-	abi_x86_64? ( ${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}" = "${PV}" ]; then
+	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 \
-			--docdir "/usr/share/doc/${PF}" \
-			$(use_enable static-libs static)
+	ECONF_SOURCE="${S}" econf \
+		--disable-werror \
+		$(use_enable static-libs static)
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name '*.la' -delete
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-libs/kvazaar/metadata.xml b/media-libs/kvazaar/metadata.xml
index ed9e985a7369..d653a0f013d6 100644
--- a/media-libs/kvazaar/metadata.xml
+++ b/media-libs/kvazaar/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>media-video@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ultravideo/kvazaar</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>media-video@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ultravideo/kvazaar</remote-id>
+	</upstream>
 </pkgmetadata>