media-libs/kvazaar: Bump to 1.0.0.

Fix tests by downloading greatest, bug #595932

Package-Manager: portage-2.3.2

4 files changed, 89 insertions, 5 deletions

diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 10fb437b1b47..63b16fc72fa4 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -1 +1,3 @@
+DIST greatest-1.2.1.tar.gz 19792 SHA256 e3c1211ec5dfea61092833bca56c6a14620ac23aa0d53940d99943587cbe1677 SHA512 c17162fa222c84fef7826ba5202aae573d516a71bc2c59c8991db2a76f7069ed53d00aaab1b792e0c7e4243fae38183764c2e7ae0a61faf2ff13e78b29ccc211 WHIRLPOOL b4e01659539e02224d5396609ba73715eca1391e9da165ac22cf28f25c13cf89a9c4059cfe3f88e1d88d06e35153f7d1d3e012433b9b4f4deaa2a464e6d6b7ca
 DIST kvazaar-0.8.3.tar.gz 429852 SHA256 a5cebc313bc2edcf631684e67c33227e56d803bfbc940cf8c2f3906b4f543a12 SHA512 7de2c311c75b77d1f9a95f1de79212560b86bd6f8d7ae743240ff33cec52ecb2837be7984f12fe617560445838381ada245196bf1bf67eeb3861f025998fdf60 WHIRLPOOL 1fdcf9835aca8a4d4261c184e957abcc4fa21df5e3d0520a63e95dfc800d086dc6ae5f70fc4110db232a013f84205230f1c5e2043f57db21cc100b33ef504d05
+DIST kvazaar-1.0.0.tar.gz 473495 SHA256 40eb7b4b23897299e99050f0c011e9380cf898b25615dd143f018b278b972a46 SHA512 94939e9560e82543c0f3a8de6f45e228156544b56cc3ce813385e24d52f5a7b65950f6f752344930951440255ca96c06e93e87ff9e721d7c63d82a7a5714c340 WHIRLPOOL ed0c6332c5a1efa88b569845f2cb5436881c3866e381369d770a3393d61e37605ad5c114dcbdae424035f451ceea5ab1ee0787769c9bf44fc44bbd2815e87ed7
diff --git a/media-libs/kvazaar/files/multilib.patch b/media-libs/kvazaar/files/multilib.patch
new file mode 100644
index 000000000000..fb0711dac994
--- /dev/null
+++ b/media-libs/kvazaar/files/multilib.patch
@@ -0,0 +1,15 @@
+https://github.com/ultravideo/kvazaar/pull/141
+
+Index: kvazaar-1.0.0/src/global.h
+===================================================================
+--- kvazaar-1.0.0.orig/src/global.h
++++ kvazaar-1.0.0/src/global.h
+@@ -253,7 +253,7 @@ typedef enum { COLOR_Y = 0, COLOR_U, COL
+ 
+ 
+ // Hardware data (abstraction of defines). Extend for other compilers
+-#if defined(_M_IX86) || defined(__i586__) || defined(__i686__) || defined(_M_X64) || defined(_M_AMD64) || defined(__amd64__) || defined(__x86_64__)
++#if defined(_M_IX86) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) || defined(_M_X64) || defined(_M_AMD64) || defined(__amd64__) || defined(__x86_64__)
+ #  define COMPILE_INTEL 1
+ #else
+ #  define COMPILE_INTEL 0
diff --git a/media-libs/kvazaar/kvazaar-1.0.0.ebuild b/media-libs/kvazaar/kvazaar-1.0.0.ebuild
new file mode 100644
index 000000000000..ef87a920b875
--- /dev/null
+++ b/media-libs/kvazaar/kvazaar-1.0.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+
+GREATEST_PV="1.2.1"
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
+fi
+
+inherit eutils multilib autotools multilib-minimal toolchain-funcs ${SCM}
+
+DESCRIPTION="An open-source HEVC encoder"
+HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	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="~amd64 ~ppc"
+fi
+
+LICENSE="LGPL-2.1"
+# subslot = libkvazaar major
+SLOT="0/3"
+IUSE="static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+ASM_DEP=">=dev-lang/yasm-1.2.0"
+DEPEND="${DEPEND}
+	abi_x86_32? ( ${ASM_DEP} )
+	abi_x86_64? ( ${ASM_DEP} )"
+
+src_prepare() {
+	epatch "${FILESDIR}/multilib.patch"
+	eautoreconf
+	if use test ; then
+		# https://bugs.gentoo.org/show_bug.cgi?id=595932
+		rmdir "${S}/greatest" || die
+		mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+		econf \
+			--docdir "/usr/share/doc/${PF}" \
+			$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete
+}
diff --git a/media-libs/kvazaar/kvazaar-9999.ebuild b/media-libs/kvazaar/kvazaar-9999.ebuild
index 4d22819d2749..7f8fec2b518d 100644
--- a/media-libs/kvazaar/kvazaar-9999.ebuild
+++ b/media-libs/kvazaar/kvazaar-9999.ebuild
@@ -6,25 +6,28 @@ EAPI=5
 
 SCM=""
 
+GREATEST_PV="1.2.1"
+
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SCM="git-r3"
 	EGIT_REPO_URI="https://github.com/ultravideo/kvazaar"
 fi
 
-inherit multilib autotools multilib-minimal toolchain-funcs ${SCM}
+inherit eutils multilib autotools multilib-minimal toolchain-funcs ${SCM}
 
 DESCRIPTION="An open-source HEVC encoder"
 HOMEPAGE="http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar"
 
 if [ "${PV#9999}" = "${PV}" ] ; then
-	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	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="~amd64 ~ppc"
 fi
 
 LICENSE="LGPL-2.1"
 # subslot = libkvazaar major
 SLOT="0/3"
-IUSE="cpu_flags_x86_avx2 static-libs"
+IUSE="static-libs test"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
@@ -36,14 +39,18 @@ DEPEND="${DEPEND}
 
 src_prepare() {
 	eautoreconf
+	if use test ; then
+		# https://bugs.gentoo.org/show_bug.cgi?id=595932
+		rmdir "${S}/greatest" || die
+		mv "${WORKDIR}/greatest-${GREATEST_PV}" "${S}/greatest" || die
+	fi
 }
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}" \
 		econf \
 			--docdir "/usr/share/doc/${PF}" \
-			$(use_enable static-libs static) \
-			$(use_enable cpu_flags_x86_avx2 asm)
+			$(use_enable static-libs static)
 }
 
 multilib_src_install_all() {